aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
diff options
context:
space:
mode:
authorMelanie2012-04-27 17:09:49 +0100
committerMelanie2012-04-27 17:09:49 +0100
commit90305001de2dc043fa76760367ac22de0056686a (patch)
treead8d39d2064d4a6b07d03b55d6cfd0dbe3d3d8f5 /OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentAdd regression test for teleporting an agent between separated regions on the... (diff)
downloadopensim-SC-90305001de2dc043fa76760367ac22de0056686a.zip
opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.gz
opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.bz2
opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-23 01:36:58 +0000