aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-07-29 16:10:45 +0100
committerMelanie2012-07-29 16:10:45 +0100
commit277491d871794b149fafa03cef850865435975d5 (patch)
tree47eeb85b0ee30ef5852cf469b5293f7d6d9d9201 /OpenSim/Region/Framework/Scenes
parentFix some merge issues and a functional issue in the scene manager (diff)
parentReturn world rotation on llGetObjectDetails()'s OBJECT_ROT (diff)
downloadopensim-SC_OLD-277491d871794b149fafa03cef850865435975d5.zip
opensim-SC_OLD-277491d871794b149fafa03cef850865435975d5.tar.gz
opensim-SC_OLD-277491d871794b149fafa03cef850865435975d5.tar.bz2
opensim-SC_OLD-277491d871794b149fafa03cef850865435975d5.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
0 files changed, 0 insertions, 0 deletions