Dan Lake 9556e0079b Merge branch 'master' into dev ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs		2011-05-05 14:24:27 -07:00
..
Caps	Merge branch 'master' into dev	2011-05-05 14:24:27 -07:00
UDP	Merge branch 'master' into dev	2011-05-05 14:24:27 -07:00