aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-08-30 00:26:18 +0100
committerJustin Clark-Casey (justincc)2014-08-30 00:26:18 +0100
commita02dae566ce510e7f43c6324996e70442cba3f46 (patch)
treed274fd2136c0c9573064b9b817dd8f9b86a95fac
parentImplement STATUS_BLOCK_GRAB_OBJECT in llSetStatus()/llGetStatus() and correct... (diff)
downloadopensim-SC-a02dae566ce510e7f43c6324996e70442cba3f46.zip
opensim-SC-a02dae566ce510e7f43c6324996e70442cba3f46.tar.gz
opensim-SC-a02dae566ce510e7f43c6324996e70442cba3f46.tar.bz2
opensim-SC-a02dae566ce510e7f43c6324996e70442cba3f46.tar.xz
Fix issue where moving a seated avatar would not adjust their subsequent stand position.
Addresses http://opensimulator.org/mantis/view.php?id=7299
-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 ebbc6f3..f744464 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Framework.Scenes
2631 2631
2632// Vector3 standPositionAdjustment 2632// Vector3 standPositionAdjustment
2633// = part.SitTargetPosition + new Vector3(0.5f, 0f, m_sitAvatarHeight / 2f); 2633// = part.SitTargetPosition + new Vector3(0.5f, 0f, m_sitAvatarHeight / 2f);
2634 Vector3 adjustmentForSitPosition = part.SitTargetPosition * part.GetWorldRotation(); 2634 Vector3 adjustmentForSitPosition = (part.SitTargetPosition + OffsetPosition) * part.GetWorldRotation();
2635 2635
2636 // XXX: This is based on the physics capsule sizes. Need to find a better way to read this rather than 2636 // XXX: This is based on the physics capsule sizes. Need to find a better way to read this rather than
2637 // hardcoding here. 2637 // hardcoding here.