diff options
| author | Melanie | 2012-01-05 07:37:31 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-05 07:37:31 +0100 |
| commit | 045f3b8b110780953953b0b5187be69ea75b7c65 (patch) | |
| tree | 785b1b3877c9932a87a49ce03a74c8ad7078aa66 /OpenSim/Region/Framework | |
| parent | Prevent spurious "CHANGED_POSITION" during region backup (diff) | |
| download | opensim-SC_OLD-045f3b8b110780953953b0b5187be69ea75b7c65.zip opensim-SC_OLD-045f3b8b110780953953b0b5187be69ea75b7c65.tar.gz opensim-SC_OLD-045f3b8b110780953953b0b5187be69ea75b7c65.tar.bz2 opensim-SC_OLD-045f3b8b110780953953b0b5187be69ea75b7c65.tar.xz | |
Clean up GetWorldPosition
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index fa8b1c0..c45cfb8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2015,13 +2015,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2015 | axPos *= parentRot; | 2015 | axPos *= parentRot; |
| 2016 | Vector3 translationOffsetPosition = axPos; | 2016 | Vector3 translationOffsetPosition = axPos; |
| 2017 | if(_parentID == 0) | 2017 | if(_parentID == 0) |
| 2018 | { | 2018 | return GroupPosition; |
| 2019 | return GroupPosition; | 2019 | else |
| 2020 | } | 2020 | return ParentGroup.AbsolutePosition + translationOffsetPosition; |
| 2021 | else | ||
| 2022 | { | ||
| 2023 | return ParentGroup.AbsolutePosition + translationOffsetPosition; //KF: Fix child prim position | ||
| 2024 | } | ||
| 2025 | } | 2021 | } |
| 2026 | 2022 | ||
| 2027 | /// <summary> | 2023 | /// <summary> |