diff options
| author | Mic Bowman | 2011-04-13 15:41:17 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-13 15:41:17 -0700 |
| commit | 590d20903c6dd596cb8ae3337065f955bd207b67 (patch) | |
| tree | f6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff) | |
| parent | remove packet monitoring debugging code (diff) | |
| download | opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz | |
Merge branch 'testmerge' into queuetest
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3d2eacd..8a8a699 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2080,7 +2080,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2080 | 2080 | ||
| 2081 | axPos *= parentRot; | 2081 | axPos *= parentRot; |
| 2082 | Vector3 translationOffsetPosition = axPos; | 2082 | Vector3 translationOffsetPosition = axPos; |
| 2083 | return GroupPosition + translationOffsetPosition; | 2083 | |
| 2084 | // m_log.DebugFormat("[SCENE OBJECT PART]: Found group pos {0} for part {1}", GroupPosition, Name); | ||
| 2085 | |||
| 2086 | Vector3 worldPos = GroupPosition + translationOffsetPosition; | ||
| 2087 | |||
| 2088 | // m_log.DebugFormat("[SCENE OBJECT PART]: Found world pos {0} for part {1}", worldPos, Name); | ||
| 2089 | |||
| 2090 | return worldPos; | ||
| 2084 | } | 2091 | } |
| 2085 | 2092 | ||
| 2086 | /// <summary> | 2093 | /// <summary> |