Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

1 files changed, 24 insertions, 24 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4e665e9..972e71c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1978,30 +1978,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
         }
 
-        private LSL_Rotation GetPartRot( SceneObjectPart part )

-        {

-            Quaternion q;

-            if (part.LinkNum == 0 || part.LinkNum == 1) // unlinked or root prim

-            {

-                    if (part.ParentGroup.RootPart.AttachmentPoint != 0)

-                    {

-                        ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar);

-                        if (avatar != null)

-                            if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)

-                                q = avatar.CameraRotation; // Mouselook

-                            else

-                                q = avatar.Rotation; // Currently infrequently updated so may be inaccurate

-                        else

-                            q = part.ParentGroup.GroupRotation; // Likely never get here but just in case

-                    }

-                    else

-                        q = part.ParentGroup.GroupRotation; // just the group rotation

-                    return new LSL_Rotation(q.X, q.Y, q.Z, q.W);

-            }

-            q = part.GetWorldRotation();

-            return new LSL_Rotation(q.X, q.Y, q.Z, q.W);

-        }

-

+        private LSL_Rotation GetPartRot( SceneObjectPart part )
+        {
+            Quaternion q;
+            if (part.LinkNum == 0 || part.LinkNum == 1) // unlinked or root prim
+            {
+                    if (part.ParentGroup.RootPart.AttachmentPoint != 0)
+                    {
+                        ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar);
+                        if (avatar != null)
+                            if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+                                q = avatar.CameraRotation; // Mouselook
+                            else
+                                q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
+                        else
+                            q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
+                    }
+                    else
+                        q = part.ParentGroup.GroupRotation; // just the group rotation
+                    return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
+            }
+            q = part.GetWorldRotation();
+            return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
+        }
+
         public LSL_Rotation llGetLocalRot()
         {
             m_host.AddScriptLPS(1);