diff options
| author | BlueWall | 2012-01-05 17:54:51 -0500 |
|---|---|---|
| committer | BlueWall | 2012-01-05 17:54:51 -0500 |
| commit | f252161941f10e1d303b372b946945fb6b548019 (patch) | |
| tree | 6037b7ddcb488dc17258f60cfb52756b86f718d6 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'new_modules' (diff) | |
| parent | Add a "j2k decode" region console command that allows a manual request for a ... (diff) | |
| download | opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.zip opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.tar.gz opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.tar.bz2 opensim-SC_OLD-f252161941f10e1d303b372b946945fb6b548019.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 |
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> |