Files
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
..
2011-07-20 14:35:06 -07:00
2011-07-15 15:32:42 -07:00