Melanie 4ce42762ee Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-01-26 00:21:21 +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	Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly.	2012-01-24 22:35:55 +00:00
IApplicationPlugin.cs	* minor: Comments	2009-08-12 22:54:57 -04:00
OpenSim.cs	Merge branch 'master' into careminster	2012-01-26 00:21:21 +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	2012-01-25 00:45:57 +00:00