Dan Lake 30a9cee425 Merge branch 'master' into dev ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/UndoState.cs		2011-07-20 14:35:06 -07:00
..
CoalescedSceneObjectsSerializer.cs	Alter uuid gather so that it properly analyzes coalesced objects.	2011-04-21 18:12:29 +01:00
SceneObjectSerializer.cs	Merge branch 'master' into dev	2011-07-20 14:35:06 -07:00
SceneXmlLoader.cs	Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.	2010-10-15 17:27:19 -07:00