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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-06-12 09:09:05 +02:00
parent 9997466632 f51ef99bd5
commit bbad68a65a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -7983,9 +7983,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Rotation r = rules.GetQuaternionItem(idx++); LSL_Rotation r = rules.GetQuaternionItem(idx++);
Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested world rotation Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested world rotation
Quaternion srot = sitpart.GetWorldRotation(); // need to replicate SL bug
rot *= Quaternion.Conjugate(srot); // removed sit part world rotation
SceneObjectGroup sitgrp = sitpart.ParentGroup;
if (sitgrp != null && sitgrp.RootPart != sitpart)
{
rot *= sitgrp.RootPart.RotationOffset;
}
Quaternion srot = sitpart.GetWorldRotation();
rot = Quaternion.Conjugate(srot) * rot; // removed sit part world rotation
av.Rotation = rot; av.Rotation = rot;
av.SendAvatarDataToAllAgents(); av.SendAvatarDataToAllAgents();
} }
@ -8003,7 +8010,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested offset rotation Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested offset rotation
Quaternion srot = sitpart.RotationOffset; Quaternion srot = sitpart.RotationOffset;
rot *= Quaternion.Conjugate(srot); // remove sit part offset rotation rot = Quaternion.Conjugate(srot) * rot; // remove sit part offset rotation
av.Rotation = rot; av.Rotation = rot;
av.SendAvatarDataToAllAgents(); av.SendAvatarDataToAllAgents();