Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 10 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 070ba57..b75260b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -11795,11 +11795,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;