Melanie b970d4f976 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2011-12-22 16:37:25 +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

Shell Environment Variables in config

2011-11-23 10:11:47 -05:00

IApplicationPlugin.cs

* minor: Comments

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

OpenSim.cs

Merge branch 'master' into careminster

2011-12-18 10:49:45 +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 branch 'master' into careminster

2011-12-22 16:37:25 +00:00