Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

6 files changed, 62 insertions, 66 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0cb6681..bad2b21 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -528,12 +528,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        // This gets locked so things stay thread safe.
-        public object SyncRoot
-        {
-            get { return m_sceneGraph.m_syncRoot; }
-        }
-
         public string DefaultScriptEngine
         {
             get { return m_defaultScriptEngine; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a4080ca..a6178e7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -93,8 +93,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected int m_activeScripts = 0;
         protected int m_scriptLPS = 0;
 
-        protected internal object m_syncRoot = new object();
-
         protected internal PhysicsScene _PhyScene;
         
         /// <summary>
@@ -201,26 +199,22 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         protected internal float UpdatePhysics(double elapsed)
         {
-            lock (m_syncRoot)
-            {
-                // Here is where the Scene calls the PhysicsScene. This is a one-way
-                // interaction; the PhysicsScene cannot access the calling Scene directly.
-                // But with joints, we want a PhysicsActor to be able to influence a
-                // non-physics SceneObjectPart. In particular, a PhysicsActor that is connected
-                // with a joint should be able to move the SceneObjectPart which is the visual
-                // representation of that joint (for editing and serialization purposes).
-                // However the PhysicsActor normally cannot directly influence anything outside
-                // of the PhysicsScene, and the non-physical SceneObjectPart which represents
-                // the joint in the Scene does not exist in the PhysicsScene.
-                //
-                // To solve this, we have an event in the PhysicsScene that is fired when a joint
-                // has changed position (because one of its associated PhysicsActors has changed 
-                // position).
-                //
-                // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
-
-                return _PhyScene.Simulate((float)elapsed);
-            }
+            // Here is where the Scene calls the PhysicsScene. This is a one-way
+            // interaction; the PhysicsScene cannot access the calling Scene directly.
+            // But with joints, we want a PhysicsActor to be able to influence a
+            // non-physics SceneObjectPart. In particular, a PhysicsActor that is connected
+            // with a joint should be able to move the SceneObjectPart which is the visual
+            // representation of that joint (for editing and serialization purposes).
+            // However the PhysicsActor normally cannot directly influence anything outside
+            // of the PhysicsScene, and the non-physical SceneObjectPart which represents
+            // the joint in the Scene does not exist in the PhysicsScene.
+            //
+            // To solve this, we have an event in the PhysicsScene that is fired when a joint
+            // has changed position (because one of its associated PhysicsActors has changed 
+            // position).
+            //
+            // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
+            return _PhyScene.Simulate((float)elapsed);
         }
 
         protected internal void UpdateScenePresenceMovement()
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5381f63..8b71f5b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -344,15 +344,15 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_parts.Count; }
         }
 
-        protected Quaternion m_rotation = Quaternion.Identity;
-
-        public virtual Quaternion Rotation
-        {
-            get { return m_rotation; }
-            set {
-                m_rotation = value; 
-            }
-        }
+//        protected Quaternion m_rotation = Quaternion.Identity;
+//
+//        public virtual Quaternion Rotation
+//        {
+//            get { return m_rotation; }
+//            set {
+//                m_rotation = value; 
+//            }
+//        }
 
         public Quaternion GroupRotation
         {
@@ -3216,17 +3216,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void OffsetForNewRegion(Vector3 offset)
-        {
-            m_rootPart.GroupPosition = offset;
-        }
-
         #endregion
 
         #region Rotation
 
         /// <summary>
-        ///
+        /// Update the rotation of the group.
         /// </summary>
         /// <param name="rot"></param>
         public void UpdateGroupRotationR(Quaternion rot)
@@ -3254,7 +3249,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Update the position and rotation of a group simultaneously.
         /// </summary>
         /// <param name="pos"></param>
         /// <param name="rot"></param>
@@ -3288,7 +3283,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Update the rotation of a single prim within the group.
         /// </summary>
         /// <param name="rot"></param>
         /// <param name="localID"></param>
@@ -3314,7 +3309,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Update the position and rotation simultaneously of a single prim within the group.
         /// </summary>
         /// <param name="rot"></param>
         /// <param name="localID"></param>
@@ -3355,7 +3350,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Update the entire rotation of the group.
         /// </summary>
         /// <param name="rot"></param>
         public void UpdateRootRotation(Quaternion rot)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0a8edf9..a2e13ce 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -821,7 +821,14 @@ namespace OpenSim.Region.Framework.Scenes
                         m_rotationOffset = actor.Orientation;
                     }
                 }
-                
+
+//                float roll, pitch, yaw = 0;
+//                m_rotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
+//
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Got euler {0} for RotationOffset on {1} {2}",
+//                    new Vector3(roll, pitch, yaw), Name, LocalId);
+
                 return m_rotationOffset;
             }
             
@@ -858,6 +865,13 @@ namespace OpenSim.Region.Framework.Scenes
                         m_log.Error("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message);
                     }
                 }
+
+//                float roll, pitch, yaw = 0;
+//                m_rotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
+//
+//                m_log.DebugFormat(
+//                    "[SCENE OBJECT PART]: Set euler {0} for RotationOffset on {1} {2}",
+//                    new Vector3(roll, pitch, yaw), Name, LocalId);
             }
         }
 
@@ -4548,12 +4562,13 @@ namespace OpenSim.Region.Framework.Scenes
             PhysActor = null;
         }
 
+        /// <summary>
+        /// This updates the part's rotation and sends out an update to clients if necessary.
+        /// </summary>
+        /// <param name="rot"></param>
         public void UpdateRotation(Quaternion rot)
         {
-            if ((rot.X != RotationOffset.X) ||
-                (rot.Y != RotationOffset.Y) ||
-                (rot.Z != RotationOffset.Z) ||
-                (rot.W != RotationOffset.W))
+            if (rot != RotationOffset)
             {
                 RotationOffset = rot;
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 35870c5..d8939fc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -548,8 +548,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     try
                     {
-                        lock (m_scene.SyncRoot)
-                            PhysicsActor.Position = value;
+                        PhysicsActor.Position = value;
                     }
                     catch (Exception e)
                     {
@@ -601,8 +600,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     try
                     {
-                        lock (m_scene.SyncRoot)
-                            PhysicsActor.Velocity = value;
+                        PhysicsActor.Velocity = value;
                     }
                     catch (Exception e)
                     {
@@ -1904,7 +1902,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             Rotation = Quaternion.CreateFromEulers(angle);
 //            m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, Rotation);
-
+            
             Vector3 agent_control_v3 = new Vector3();
             HandleMoveToTargetUpdate(ref agent_control_v3);
             AddNewMovement(agent_control_v3);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 2912a46..90cdd7b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -62,9 +62,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             grp1.AbsolutePosition = new Vector3(10, 10, 10);
             grp2.AbsolutePosition = Vector3.Zero;
-            
+
             // <90,0,0>
-            grp1.Rotation = (Quaternion.CreateFromEulers(90 * Utils.DEG_TO_RAD, 0, 0));
+//            grp1.UpdateGroupRotationR(Quaternion.CreateFromEulers(90 * Utils.DEG_TO_RAD, 0, 0));
 
             // <180,0,0>
             grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             if (debugtest)
             {
                 m_log.Debug("parts: " + grp1.Parts.Length);
-                m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
+                m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.GroupRotation);
                 m_log.Debug("Group1: Prim1: OffsetPosition:"+ part1.OffsetPosition+", OffsetRotation:"+part1.RotationOffset);
                 m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+part2.RotationOffset);
             }
@@ -152,13 +152,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             grp4.AbsolutePosition = new Vector3(40, 40, 40);
 
             // <90,0,0>
-            grp1.Rotation = (Quaternion.CreateFromEulers(90 * Utils.DEG_TO_RAD, 0, 0));
+//            grp1.UpdateGroupRotationR(Quaternion.CreateFromEulers(90 * Utils.DEG_TO_RAD, 0, 0));
 
             // <180,0,0>
             grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
 
             // <270,0,0>
-            grp3.Rotation = (Quaternion.CreateFromEulers(270 * Utils.DEG_TO_RAD, 0, 0));
+//            grp3.UpdateGroupRotationR(Quaternion.CreateFromEulers(270 * Utils.DEG_TO_RAD, 0, 0));
 
             // <0,90,0>
             grp4.UpdateGroupRotationR(Quaternion.CreateFromEulers(0, 90 * Utils.DEG_TO_RAD, 0));
@@ -187,12 +187,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             {
                 m_log.Debug("--------After Link-------");
                 m_log.Debug("Group1: parts:" + grp1.Parts.Length);
-                m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
+                m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.GroupRotation);
                 m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
                 m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+ part2.RotationOffset);
 
                 m_log.Debug("Group3: parts:" + grp3.Parts.Length);
-                m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
+                m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.GroupRotation);
                 m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
                 m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
             }
@@ -240,12 +240,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             {
                 m_log.Debug("--------After De-Link-------");
                 m_log.Debug("Group1: parts:" + grp1.Parts.Length);
-                m_log.Debug("Group1: Pos:" + grp1.AbsolutePosition + ", Rot:" + grp1.Rotation);
+                m_log.Debug("Group1: Pos:" + grp1.AbsolutePosition + ", Rot:" + grp1.GroupRotation);
                 m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
                 m_log.Debug("Group1: Prim2: OffsetPosition:" + part2.OffsetPosition + ", OffsetRotation:" + part2.RotationOffset);
 
                 m_log.Debug("Group3: parts:" + grp3.Parts.Length);
-                m_log.Debug("Group3: Pos:" + grp3.AbsolutePosition + ", Rot:" + grp3.Rotation);
+                m_log.Debug("Group3: Pos:" + grp3.AbsolutePosition + ", Rot:" + grp3.GroupRotation);
                 m_log.Debug("Group3: Prim1: OffsetPosition:" + part3.OffsetPosition + ", OffsetRotation:" + part3.RotationOffset);
                 m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset);
             }