aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2011-11-05 20:39:43 +0000
committerMelanie2011-11-05 20:39:43 +0000
commitcc8e693fb9c00b24ccdde586324bbcc30ac218e6 (patch)
tree23931e4b3c879606442e98cca57681402605c941 /OpenSim/Region
parentSome trivial changes to get closer to core (diff)
downloadopensim-SC_OLD-cc8e693fb9c00b24ccdde586324bbcc30ac218e6.zip
opensim-SC_OLD-cc8e693fb9c00b24ccdde586324bbcc30ac218e6.tar.gz
opensim-SC_OLD-cc8e693fb9c00b24ccdde586324bbcc30ac218e6.tar.bz2
opensim-SC_OLD-cc8e693fb9c00b24ccdde586324bbcc30ac218e6.tar.xz
Remove unused and broken OffsetRotation from ScenePresence
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs33
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 5 insertions, 30 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 86e557e..19e6a20 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -199,7 +199,6 @@ namespace OpenSim.Region.Framework.Scenes
199 //PauPaw:Proper PID Controler for autopilot************ 199 //PauPaw:Proper PID Controler for autopilot************
200 public bool MovingToTarget { get; private set; } 200 public bool MovingToTarget { get; private set; }
201 public Vector3 MoveToPositionTarget { get; private set; } 201 public Vector3 MoveToPositionTarget { get; private set; }
202 private Quaternion m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
203 202
204 /// <summary> 203 /// <summary>
205 /// Controls whether an avatar automatically moving to a target will land when it gets there (if flying). 204 /// Controls whether an avatar automatically moving to a target will land when it gets there (if flying).
@@ -612,39 +611,15 @@ namespace OpenSim.Region.Framework.Scenes
612 } 611 }
613 } 612 }
614 613
615 public Quaternion OffsetRotation
616 {
617 get { return m_offsetRotation; }
618 set { m_offsetRotation = value; }
619 }
620 private Quaternion m_bodyRot = Quaternion.Identity; 614 private Quaternion m_bodyRot = Quaternion.Identity;
621 615
622 public Quaternion Rotation 616 public Quaternion Rotation
623 { 617 {
624 get { 618 get { return m_bodyRot; }
625 if (m_parentID != 0) 619 set
626 { 620 {
627 if (m_offsetRotation != null)
628 {
629 return m_offsetRotation;
630 }
631 else
632 {
633 return new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
634 }
635
636 }
637 else
638 {
639 return m_bodyRot;
640 }
641 }
642 set {
643 m_bodyRot = value; 621 m_bodyRot = value;
644 if (m_parentID != 0) 622// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
645 {
646 m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
647 }
648 } 623 }
649 } 624 }
650 625
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ff91cfa..04f10c6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7564,7 +7564,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7564 return; 7564 return;
7565 LSL_Rotation r; 7565 LSL_Rotation r;
7566 r = rules.GetQuaternionItem(idx++); 7566 r = rules.GetQuaternionItem(idx++);
7567 av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); 7567 av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
7568 av.SendAvatarDataToAllAgents(); 7568 av.SendAvatarDataToAllAgents();
7569 break; 7569 break;
7570 } 7570 }