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

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

2013-01-11 02:13:10 +00:00

..

Application.cs

Add using clause I missed

2012-09-30 15:57:49 +01:00

ConfigurationLoader.cs

Make "config show/set/get/save" console commands available on all servers

2012-11-22 05:48:41 +00:00

IApplicationPlugin.cs

* minor: Comments

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

OpenSim.cs

Merge branch 'master' into careminster

2013-01-11 02:13:10 +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 'careminster' into avination

2012-11-23 03:42:04 +00:00