Dan Lake 7447765f4d Merge branch 'master' into dev ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/Physics/OdePlugin/OdePlugin.cs		2011-07-15 15:32:42 -07:00
..
Application.cs	Adding boolean alias for commandline switches like -save_crashes=yes	2011-06-01 21:14:16 +01:00
ConfigurationLoader.cs	Make default serverside_object_permissions = true since this better matches user expectations.	2011-07-01 23:06:46 +01:00
IApplicationPlugin.cs	* minor: Comments	2009-08-12 22:54:57 -04:00
OpenSim.cs	Merge branch 'master' into dev	2011-06-14 23:15:34 -07: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 dev	2011-06-14 23:15:34 -07:00