From 659be9dd504587c637e5b3ae14276b2327029e0d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 29 Jul 2012 15:11:39 +0200
Subject: When controls are released by script, don't drop the permission to
 retake them.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 --
 1 file changed, 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 2425646..fac249e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3315,8 +3315,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     {
                         // Unregister controls from Presence
                         presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
-                        // Remove Take Control permission.
-                        m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
                     }
                 }
             }
-- 
cgit v1.1


From 88d68e68c19107701ca8fbfb73413e0ea978b862 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 29 Jul 2012 15:40:31 +0200
Subject: Return world rotation on llGetObjectDetails()'s OBJECT_ROT

---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 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 fac249e..cd72dc2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -11846,11 +11846,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
                                 break;
                             case ScriptBaseClass.OBJECT_ROT:
-//                                Quaternion orot = obj.RotationOffset;                               
-//                                ret.Add(new LSL_Rotation(orot.X, orot.Y, orot.Z, orot.W));
+                                {
+                                    Quaternion rot = Quaternion.Identity; 
+
+                                    if (obj.ParentGroup.RootPart == obj)
+                                        rot = obj.ParentGroup.GroupRotation;
+                                    else
+                                        rot = obj.GetWorldRotation();
 
-                                LSL_Rotation objrot = GetPartRot(obj);
-                                ret.Add(objrot);
+                                    LSL_Rotation objrot = new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
+                                    ret.Add(objrot);
+                                }
                                 break;
                             case ScriptBaseClass.OBJECT_VELOCITY:
                                 Vector3 ovel = obj.Velocity;
-- 
cgit v1.1