aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-01-28 04:05:49 +0100
committerMelanie2011-01-28 04:05:49 +0100
commit3bce53b6e6a23bd4e631db4663007ba65ea0bcb7 (patch)
treeef4c2dfa39bfb78aa823276360416db80193dc89 /OpenSim
parentChange the way ban lines are handled. Remove a lot of useless stuff designed (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-3bce53b6e6a23bd4e631db4663007ba65ea0bcb7.zip
opensim-SC_OLD-3bce53b6e6a23bd4e631db4663007ba65ea0bcb7.tar.gz
opensim-SC_OLD-3bce53b6e6a23bd4e631db4663007ba65ea0bcb7.tar.bz2
opensim-SC_OLD-3bce53b6e6a23bd4e631db4663007ba65ea0bcb7.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1d7bf4c..b54d1b8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -497,7 +497,7 @@ namespace OpenSim.Region.Framework.Scenes
497 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); 497 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
498 if (part != null) 498 if (part != null)
499 { 499 {
500 return m_parentPosition + (m_pos * part.GetWorldRotation()); 500 return part.AbsolutePosition + (m_pos * part.GetWorldRotation());
501 } 501 }
502 else 502 else
503 { 503 {