mirror of
https://github.com/opensim/opensim.git
synced 2026-06-04 01:26:06 +08:00
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs