mantis 8140: fix objectTeleport rotation if stop TRUE

2017-04-04 00:30:19 +01:00 · 2017-04-04 00:30:19 +01:00 · c6150c2066
parent 4bb27917f4
commit c6150c2066
1 changed files with 9 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@ -900,11 +900,19 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                }

+                rotation.Normalize();
                if(stop)
+                {
                    RootPart.Stop();
+                    if(Math.Abs(rotation.W) < 0.999)
+                    {
+                        Quaternion rot = RootPart.RotationOffset;
+                        rot *= rotation;
+                        RootPart.RotationOffset = rot;
+                    }
+                }
                else
                {
-                    rotation.Normalize();
                    if(Math.Abs(rotation.W) < 0.999)
                    {
                        Quaternion rot = RootPart.RotationOffset;