Melanie b9146a7922 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2013-03-15 23:45:32 +00:00
..
Application.cs	Additional ThreadPool worker and IOCP thread startup logic	2013-02-10 14:14:33 -05: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-03-15 23:45:32 +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	2013-03-15 23:45:32 +00:00