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
..
ObjectAdd.cs	Nope, that didn't feel right. Moving all those modules to Linden space.	2011-04-30 13:24:25 -07:00
UploadObjectAssetModule.cs	Merge branch 'master' into dev	2011-07-20 14:35:06 -07:00