aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-01-05 08:11:52 +0000
committerMelanie2012-01-05 08:11:52 +0000
commit97ba3c93467e865d0434c0b2f0f775efdc0c354a (patch)
tree4ddd7a2ad260c0695113eb18502ae455e3d16a7e /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-97ba3c93467e865d0434c0b2f0f775efdc0c354a.zip
opensim-SC_OLD-97ba3c93467e865d0434c0b2f0f775efdc0c354a.tar.gz
opensim-SC_OLD-97ba3c93467e865d0434c0b2f0f775efdc0c354a.tar.bz2
opensim-SC_OLD-97ba3c93467e865d0434c0b2f0f775efdc0c354a.tar.xz
Small fix to GetWorldPosition to get closer to Avination sit behavior
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index aea47e6..51d3586 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1960,19 +1960,13 @@ namespace OpenSim.Region.Framework.Scenes
1960 public Vector3 GetWorldPosition() 1960 public Vector3 GetWorldPosition()
1961 { 1961 {
1962 Quaternion parentRot = ParentGroup.RootPart.RotationOffset; 1962 Quaternion parentRot = ParentGroup.RootPart.RotationOffset;
1963
1964 Vector3 axPos = OffsetPosition; 1963 Vector3 axPos = OffsetPosition;
1965
1966 axPos *= parentRot; 1964 axPos *= parentRot;
1967 Vector3 translationOffsetPosition = axPos; 1965 Vector3 translationOffsetPosition = axPos;
1968 1966 if(_parentID == 0)
1969// m_log.DebugFormat("[SCENE OBJECT PART]: Found group pos {0} for part {1}", GroupPosition, Name); 1967 return GroupPosition;
1970 1968 else
1971 Vector3 worldPos = GroupPosition + translationOffsetPosition; 1969 return ParentGroup.AbsolutePosition + translationOffsetPosition;
1972
1973// m_log.DebugFormat("[SCENE OBJECT PART]: Found world pos {0} for part {1}", worldPos, Name);
1974
1975 return worldPos;
1976 } 1970 }
1977 1971
1978 /// <summary> 1972 /// <summary>