aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
diff options
context:
space:
mode:
authorMelanie2012-11-04 23:30:11 +0000
committerMelanie2012-11-04 23:30:11 +0000
commit4d6ee1aea6053d434f05e0f6f8959fc851358ed6 (patch)
treea5cfdc3fca945e47b22ca028cd6ad81c73e6510c /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
parentMerge branch 'master' into careminster (diff)
parentPrevent IMs being sent to prims when avies decline inventory offers from them. (diff)
downloadopensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.zip
opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.tar.gz
opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.tar.bz2
opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-17 21:06:35 +0000