mirror of
git://opensimulator.org/git/opensim
synced 2026-08-14 09:02:50 +00:00
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs