ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

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

@@ -3312,7 +3312,9 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 sitOffset;
Quaternion r = sitTargetOrient;
if(LegacySitOffsets)
Vector3 newPos;
if (LegacySitOffsets)
{
double m1,m2;
@@ -3343,6 +3345,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 up = new Vector3((float)x, (float)y, (float)z);
sitOffset = up * (float)offset;
newPos = sitTargetPos - sitOffset + SIT_TARGET_ADJUSTMENT;
}
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;
Vector3 up = new Vector3((float)x, (float)y, (float)z);
sitOffset = up * Appearance.AvatarHeight * 0.02638f;
}
newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
Quaternion newRot;
if (part.IsRoot)