mirror of
https://github.com/opensim/opensim.git
synced 2026-06-01 07:15:44 +08:00
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs