aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2011-10-30 10:16:25 +0000
committerMelanie2011-10-30 10:16:25 +0000
commit083b28de8c45589a43ce6ceed4dbfb70c698f2d0 (patch)
treefc494b5d401bf2190e8c2d9ee027021f330d6285 /OpenSim/Region/ScriptEngine
parentFix the offline message module to revert core changes and restore avn (diff)
parentAdd missing max_listens_per_region to [LL_Functions] config section in OpenSi... (diff)
downloadopensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.zip
opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.gz
opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.bz2
opensim-SC-083b28de8c45589a43ce6ceed4dbfb70c698f2d0.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index dc22017..c0d2f38 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
550 if (World.Entities.TryGetValue(target, out entity)) 550 if (World.Entities.TryGetValue(target, out entity))
551 { 551 {
552 if (entity is SceneObjectGroup) 552 if (entity is SceneObjectGroup)
553 ((SceneObjectGroup)entity).Rotation = rotation; 553 ((SceneObjectGroup)entity).UpdateGroupRotationR(rotation);
554 else if (entity is ScenePresence) 554 else if (entity is ScenePresence)
555 ((ScenePresence)entity).Rotation = rotation; 555 ((ScenePresence)entity).Rotation = rotation;
556 } 556 }