diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
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 | } |