OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix position changes when sitting on a prim with position and/or orientation explicitly specified

link-sitting
Justin Clark-Casey (justincc) 2013-11-26 00:43:35 +00:00
parent b9e42aeb6e
commit 36d146bf27
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2267,7 +2267,6 @@ namespace OpenSim.Region.Framework.Scenes
m_sitAvatarHeight = PhysicsActor.Size.Z; m_sitAvatarHeight = PhysicsActor.Size.Z;
bool canSit = false; bool canSit = false;
Vector3 pos = part.AbsolutePosition + offset;
if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero) if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
{ {
@ -2277,10 +2276,24 @@ namespace OpenSim.Region.Framework.Scenes
offset = part.SitTargetPosition; offset = part.SitTargetPosition;
sitOrientation = part.SitTargetOrientation; sitOrientation = part.SitTargetOrientation;
// m_log.DebugFormat("Old sit orient {0}", sitOrientation);
if (part.IsRoot)
sitOrientation = sitOrientation;
else
sitOrientation = part.RotationOffset * sitOrientation;
// m_log.DebugFormat("New sit orient {0}", sitOrientation);
// m_log.DebugFormat("Old sit offset {0}", offset);
offset = offset * sitOrientation;
// m_log.DebugFormat("New sit offset {0}", offset);
canSit = true; canSit = true;
} }
else else
{ {
Vector3 pos = part.AbsolutePosition + offset;
if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10) if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
@ -2590,8 +2603,20 @@ namespace OpenSim.Region.Framework.Scenes
//Quaternion result = (sitTargetOrient * vq) * nq; //Quaternion result = (sitTargetOrient * vq) * nq;
m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition; Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
if (part.IsRoot)
Rotation = sitTargetOrient;
else
Rotation = part.RotationOffset * sitTargetOrient; Rotation = part.RotationOffset * sitTargetOrient;
// m_log.DebugFormat("Old offset2 {0}", newPos);
newPos = newPos * Rotation;
// m_log.DebugFormat("New offset2 {0}", newPos);
newPos += part.OffsetPosition;
m_pos = newPos;
ParentPosition = part.AbsolutePosition; ParentPosition = part.AbsolutePosition;
} }
else else