Melanie 81552f41c6 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs

2013-03-05 23:57:53 +00:00

5.2 KiB

Raw Blame History

View Raw