diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 21 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3a4f52e..b68cc9f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -797,7 +797,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
797 | m_rotationOffset = actor.Orientation; | 797 | m_rotationOffset = actor.Orientation; |
798 | } | 798 | } |
799 | } | 799 | } |
800 | 800 | ||
801 | // float roll, pitch, yaw = 0; | ||
802 | // m_rotationOffset.GetEulerAngles(out roll, out pitch, out yaw); | ||
803 | // | ||
804 | // m_log.DebugFormat( | ||
805 | // "[SCENE OBJECT PART]: Got euler {0} for RotationOffset on {1} {2}", | ||
806 | // new Vector3(roll, pitch, yaw), Name, LocalId); | ||
807 | |||
801 | return m_rotationOffset; | 808 | return m_rotationOffset; |
802 | } | 809 | } |
803 | 810 | ||
@@ -834,6 +841,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
834 | m_log.Error("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message); | 841 | m_log.Error("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message); |
835 | } | 842 | } |
836 | } | 843 | } |
844 | |||
845 | // float roll, pitch, yaw = 0; | ||
846 | // m_rotationOffset.GetEulerAngles(out roll, out pitch, out yaw); | ||
847 | // | ||
848 | // m_log.DebugFormat( | ||
849 | // "[SCENE OBJECT PART]: Set euler {0} for RotationOffset on {1} {2}", | ||
850 | // new Vector3(roll, pitch, yaw), Name, LocalId); | ||
837 | } | 851 | } |
838 | } | 852 | } |
839 | 853 | ||
@@ -4492,12 +4506,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
4492 | PhysActor = null; | 4506 | PhysActor = null; |
4493 | } | 4507 | } |
4494 | 4508 | ||
4509 | /// <summary> | ||
4510 | /// This updates the part's rotation and sends out an update to clients if necessary. | ||
4511 | /// </summary> | ||
4512 | /// <param name="rot"></param> | ||
4495 | public void UpdateRotation(Quaternion rot) | 4513 | public void UpdateRotation(Quaternion rot) |
4496 | { | 4514 | { |
4497 | if ((rot.X != RotationOffset.X) || | 4515 | if (rot != RotationOffset) |
4498 | (rot.Y != RotationOffset.Y) || | ||
4499 | (rot.Z != RotationOffset.Z) || | ||
4500 | (rot.W != RotationOffset.W)) | ||
4501 | { | 4516 | { |
4502 | RotationOffset = rot; | 4517 | RotationOffset = rot; |
4503 | 4518 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3834b79..0880e21 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1769,7 +1769,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1769 | 1769 | ||
1770 | Rotation = Quaternion.CreateFromEulers(angle); | 1770 | Rotation = Quaternion.CreateFromEulers(angle); |
1771 | // m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, Rotation); | 1771 | // m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, Rotation); |
1772 | 1772 | ||
1773 | Vector3 agent_control_v3 = new Vector3(); | 1773 | Vector3 agent_control_v3 = new Vector3(); |
1774 | HandleMoveToTargetUpdate(ref agent_control_v3); | 1774 | HandleMoveToTargetUpdate(ref agent_control_v3); |
1775 | AddNewMovement(agent_control_v3); | 1775 | AddNewMovement(agent_control_v3); |