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

Addressing #7903. Fix legacy sit offsets to use legacy computation. 

New offsets of course still use the correct math.
LSLKeyTest
Melanie Thielker 2016-05-23 19:18:24 +02:00
parent 1e44aba620
commit 775a657bb1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3312,6 +3312,8 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 sitOffset; Vector3 sitOffset;
Quaternion r = sitTargetOrient; Quaternion r = sitTargetOrient;
Vector3 newPos;
if (LegacySitOffsets) if (LegacySitOffsets)
{ {
double m1,m2; double m1,m2;
@ -3343,6 +3345,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 up = new Vector3((float)x, (float)y, (float)z); Vector3 up = new Vector3((float)x, (float)y, (float)z);
sitOffset = up * (float)offset; sitOffset = up * (float)offset;
newPos = sitTargetPos - sitOffset + SIT_TARGET_ADJUSTMENT;
} }
else else
{ {
@ -3373,9 +3376,8 @@ namespace OpenSim.Region.Framework.Scenes
z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W; z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
Vector3 up = new Vector3((float)x, (float)y, (float)z); Vector3 up = new Vector3((float)x, (float)y, (float)z);
sitOffset = up * Appearance.AvatarHeight * 0.02638f; sitOffset = up * Appearance.AvatarHeight * 0.02638f;
} newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
Quaternion newRot; Quaternion newRot;
if (part.IsRoot) if (part.IsRoot)