aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:11:55 +0100
committerMelanie2011-10-11 22:11:55 +0100
commit68a42af30f2b839eca4e081bbc7c34d6966eaf47 (patch)
treef8368acbb87c407cb400bc4a07130b9db78b1ed5 /OpenSim
parentMerge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge (diff)
parentminor: I was wrong about OffsetPosition - sometimes it genuinely does return ... (diff)
downloadopensim-SC_OLD-68a42af30f2b839eca4e081bbc7c34d6966eaf47.zip
opensim-SC_OLD-68a42af30f2b839eca4e081bbc7c34d6966eaf47.tar.gz
opensim-SC_OLD-68a42af30f2b839eca4e081bbc7c34d6966eaf47.tar.bz2
opensim-SC_OLD-68a42af30f2b839eca4e081bbc7c34d6966eaf47.tar.xz
Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 712ec70..bc6458f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -553,6 +553,10 @@ namespace OpenSim.Region.Framework.Scenes
553 } 553 }
554 } 554 }
555 555
556 /// <summary>
557 /// If sitting, returns the offset position from the prim the avatar is sitting on.
558 /// Otherwise, returns absolute position in the scene.
559 /// </summary>
556 public Vector3 OffsetPosition 560 public Vector3 OffsetPosition
557 { 561 {
558 get { return m_pos; } 562 get { return m_pos; }