Melanie 008c98a974 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/World/Region/RestartModule.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2013-09-01 22:49:31 +01:00

..

Application.cs

minor: Consistently log IOCP for IO completion thread startup log information instead of mixing this with "IO Completion Threads"

2013-08-09 18:27:26 +01:00

ConfigurationLoader.cs

Initialization: move key expansion out to operate on all sources and not just environment variables

2013-08-29 14:35:56 -04:00

IApplicationPlugin.cs

* minor: Comments

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

OpenSim.cs

Merge branch 'master' into careminster

2013-08-11 17:31:25 +01: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

2013-08-11 17:31:25 +01:00