mirror of
https://github.com/opensim/opensim.git
synced 2026-07-16 12:42:02 +08:00
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs