Melanie b69f679122 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2011-11-01 23:54:09 +00:00

..

Application.cs

Temporarily put in a log line which shows which locale the user is running in.

2011-07-29 23:43:35 +01:00

ConfigurationLoader.cs

move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others

2011-10-15 03:03:05 +01:00

IApplicationPlugin.cs

* minor: Comments

2009-08-12 22:54:57 -04:00

OpenSim.cs

Merge branch 'master' into bigmerge

2011-11-01 23:54:09 +00:00

OpenSimBackground.cs

Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet

2009-10-09 02:10:53 -07:00

OpenSimBase.cs

Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge

2011-10-25 02:14:39 +01:00