Files
opensim/OpenSim/Region/ScriptEngine/Shared/Api
Melanie e4f3ba8610 Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-12 00:10:30 +01:00
..