2 files changed, 38 insertions, 12 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2e8b053..b333b55 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8047,7 +8047,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             sp.OffsetPosition = rules.GetVector3Item(idx++);
                             break;
 
-                        case (int)ScriptBaseClass.PRIM_ROTATION:
+                        case (int)ScriptBaseClass.PRIM_ROTATION:                       
+                            if (remain < 1)
+                                return null;
+
+                            Quaternion inRot = rules.GetQuaternionItem(idx++);
+
+                            SceneObjectPart parentPart = sp.ParentPart;
+
+                            if (parentPart != null)
+                                sp.Rotation = m_host.GetWorldRotation() * inRot;
+
+                            break;
+
                         case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                             if (remain < 1)
                                 return null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs
index 167fe78..86381c4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs
@@ -86,6 +86,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             new SceneHelpers().SetupScene();
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
+            part.RotationOffset = new Quaternion(0.7071068f, 0, 0, 0.7071068f);
 
             LSL_Api apiGrp1 = new LSL_Api();
             apiGrp1.Initialize(m_engine, part, null, null);
@@ -99,17 +100,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, part.UUID, Vector3.Zero);
 
             // Test position
-            Vector3 newPos = new Vector3(1, 2, 3);
-            apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_POSITION, newPos));
-
-            Assert.That(sp.OffsetPosition, Is.EqualTo(newPos));
-
-            // Test rotation
-            Quaternion newRot = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
-            apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_ROTATION, newRot));
-
-            Assert.That(
-                sp.Rotation, new QuaternionToleranceConstraint(newRot, 0.000001));
+            {
+                Vector3 newPos = new Vector3(1, 2, 3);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_POSITION, newPos));
+
+                Assert.That(sp.OffsetPosition, Is.EqualTo(newPos));
+            }
+
+            // Test world rotation
+            {
+                Quaternion newRot = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_ROTATION, newRot));
+
+                Assert.That(
+                    sp.Rotation, new QuaternionToleranceConstraint(part.GetWorldRotation() * newRot, 0.000001));
+            }
+
+            // Test local rotation
+            {
+                Quaternion newRot = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
+                apiGrp1.llSetLinkPrimitiveParams(2, new LSL_Types.list(ScriptBaseClass.PRIM_ROT_LOCAL, newRot));
+
+                Assert.That(
+                    sp.Rotation, new QuaternionToleranceConstraint(newRot, 0.000001));
+            }
         }
     }
 }
\ No newline at end of file