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

1 files changed, 7 insertions, 23 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6807e1b..25489d8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -204,22 +204,9 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_parts.Count; }
         }
 
-        public override Quaternion Rotation
+        public Quaternion GroupRotation
         {
             get { return m_rootPart.RotationOffset; }
-            set { m_rootPart.RotationOffset = value; }
-        }
-
-        public override Vector3 Scale
-        {
-            get { return m_rootPart.Scale; }
-            set { m_rootPart.Scale = value; }
-        }
-
-        public override Vector3 Velocity
-        {
-            get { return m_rootPart.Velocity; }
-            set { m_rootPart.Velocity = value; }
         }
 
         public UUID GroupID
@@ -541,7 +528,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // Temporary commented to stop compiler warning
                     //Vector3 partPosition =
                     //    new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z);
-                    Quaternion parentrotation = Rotation;
+                    Quaternion parentrotation = GroupRotation;
 
                     // Telling the prim to raytrace.
                     //EntityIntersection inter = part.TestIntersection(hRay, parentrotation);
@@ -1884,17 +1871,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 checkAtTargets();
 
-                Quaternion rot = Rotation;
-
-                if (UsePhysics &&
-                      ((Math.Abs(lastPhysGroupRot.W - rot.W) > 0.1f)
-                    || (Math.Abs(lastPhysGroupRot.X - rot.X) > 0.1f)
-                    || (Math.Abs(lastPhysGroupRot.Y - rot.Y) > 0.1f)
-                    || (Math.Abs(lastPhysGroupRot.Z - rot.Z) > 0.1f)))
+                if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
+                    || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
+                    || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1)
+                    || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1)))
                 {
                     m_rootPart.UpdateFlag = 1;
 
-                    lastPhysGroupRot = rot;
+                    lastPhysGroupRot = GroupRotation;
                 }
 
                 foreach (SceneObjectPart part in m_parts.Values)