From f7b88d1c40ba06c62491d8d32809fe6c1c4d360d Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Sun, 2 Sep 2012 13:43:16 +0100
Subject: made setting rotation match Second Life

---
 .../Shared/Api/Implementation/LSL_Api.cs           | 33 +---------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index be22cb4..9f952d1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2083,23 +2083,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetRot(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
-
-            // try to let this work as in SL...
-            if (m_host.ParentID == 0)
-            {
-                // special case: If we are root, rotate complete SOG to new rotation
                 SetRot(m_host, rot);
-            }
-            else
-            {
-                // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
-                SceneObjectPart rootPart = m_host.ParentGroup.RootPart;
-                if (rootPart != null) // better safe than sorry
-                {
-                    SetRot(m_host, rootPart.RotationOffset * (Quaternion)rot);
-                }
-            }
-
             ScriptSleep(200);
         }
 
@@ -7292,22 +7276,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             break;
                         case (int)ScriptBaseClass.PRIM_ROTATION:
+                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                             if (remain < 1)
                                 return null;
 
                             LSL_Rotation q = rules.GetQuaternionItem(idx++);
-                            // try to let this work as in SL...
-                            if (part.ParentID == 0)
-                            {
-                                // special case: If we are root, rotate complete SOG to new rotation
                                 SetRot(part, q);
-                            }
-                            else
-                            {
-                                // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
-                                SceneObjectPart rootPart = part.ParentGroup.RootPart;
-                                SetRot(part, rootPart.RotationOffset * (Quaternion)q);
-                            }
 
                             break;
 
@@ -7614,11 +7588,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             string primDesc = rules.GetLSLStringItem(idx++);
                             part.Description = primDesc;
                             break;
-                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
-                            if (remain < 1)
-                                return null;
-                            SetRot(part, rules.GetQuaternionItem(idx++));
-                            break;
                         case (int)ScriptBaseClass.PRIM_OMEGA:
                             if (remain < 3)
                                 return null;
-- 
cgit v1.1


From a3d140b57c5e2ae0f3334d59b82e116d40199b49 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Sun, 2 Sep 2012 13:45:42 +0100
Subject: no need to assign rotation to a variable now

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9f952d1..6f4bc8b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7280,8 +7280,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             if (remain < 1)
                                 return null;
 
-                            LSL_Rotation q = rules.GetQuaternionItem(idx++);
-                                SetRot(part, q);
+                                SetRot(part, rules.GetQuaternionItem(idx++));
 
                             break;
 
-- 
cgit v1.1


From fb211c64fd9d335f4879549023870b1e28416f74 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Sun, 2 Sep 2012 13:47:18 +0100
Subject: formatting

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6f4bc8b..1d2ef40 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2083,7 +2083,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetRot(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
-                SetRot(m_host, rot);
+            SetRot(m_host, rot);
             ScriptSleep(200);
         }
 
@@ -7280,7 +7280,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             if (remain < 1)
                                 return null;
 
-                                SetRot(part, rules.GetQuaternionItem(idx++));
+                            SetRot(part, rules.GetQuaternionItem(idx++));
 
                             break;
 
-- 
cgit v1.1