mirror of
https://github.com/opensim/opensim.git
synced 2026-08-02 14:56:19 +08:00
Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs