OpenSimMirror/OpenSim/Region/Framework
Dan Lake 32ddcefaca Merge branch 'master' into dev
Conflicts:
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
2011-06-14 23:15:34 -07:00
..
Interfaces Merge branch 'master' into dev 2011-06-14 23:15:34 -07:00
Scenes Merge branch 'master' into dev 2011-06-14 23:15:34 -07:00
ModuleLoader.cs Make it more obvious when it happens that DLL plugin loading fails. Improve exception output on Windows. 2011-04-11 21:51:17 +01:00