aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
diff options
context:
space:
mode:
authorMelanie2012-04-14 01:51:20 +0100
committerMelanie2012-04-14 01:51:20 +0100
commit919972a440acae2e3324cfe178ff249986855055 (patch)
tree82054de2b261d4f7f49f4eced021aa731b9b21aa /OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-919972a440acae2e3324cfe178ff249986855055.zip
opensim-SC-919972a440acae2e3324cfe178ff249986855055.tar.gz
opensim-SC-919972a440acae2e3324cfe178ff249986855055.tar.bz2
opensim-SC-919972a440acae2e3324cfe178ff249986855055.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-29 17:13:46 +0000