aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-27 05:52:24 +0000
committerTeravus Ovares2007-12-27 05:52:24 +0000
commitda66f3eac83ab2329b100108c767508b4e85a52f (patch)
tree072a52720e5552933c5e097f7137b5ec49a76ce4 /OpenSim
parent* Fixed compile issue caused by half-refactoring (sorrry!) (diff)
downloadopensim-SC_OLD-da66f3eac83ab2329b100108c767508b4e85a52f.zip
opensim-SC_OLD-da66f3eac83ab2329b100108c767508b4e85a52f.tar.gz
opensim-SC_OLD-da66f3eac83ab2329b100108c767508b4e85a52f.tar.bz2
opensim-SC_OLD-da66f3eac83ab2329b100108c767508b4e85a52f.tar.xz
* fixed a logic error in the receiving end of the prim load for the sit target
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 973c30e..670d259 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -810,8 +810,11 @@ namespace OpenSim.Region.Environment.Scenes
810 // Utility function so the databases don't have to reference axiom.math 810 // Utility function so the databases don't have to reference axiom.math
811 public void SetSitTargetLL(LLVector3 offset, LLQuaternion orientation) 811 public void SetSitTargetLL(LLVector3 offset, LLQuaternion orientation)
812 { 812 {
813 m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z); 813 if (!(offset.X == 0 && offset.Y == 0 && offset.Z == 0 && orientation.W == 0 && orientation.X == 0 && orientation.Y == 0 && (orientation.Z == 0 || orientation.Z == 1)))
814 m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z); 814 {
815 m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z);
816 m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z);
817 }
815 } 818 }
816 819
817 public Vector3 GetSitTargetPosition() 820 public Vector3 GetSitTargetPosition()