aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2013-01-11 13:39:14 +0000
committerUbitUmarov2013-01-11 13:39:14 +0000
commit756d53db5e9c7a2ac73e501b7883381026f3c608 (patch)
tree9211e64be89e9a0f509a91cd3fc1dd715c29d483
parent fix llGetRot and parameters prim_rotation for attachments. Only on (diff)
downloadopensim-SC-756d53db5e9c7a2ac73e501b7883381026f3c608.zip
opensim-SC-756d53db5e9c7a2ac73e501b7883381026f3c608.tar.gz
opensim-SC-756d53db5e9c7a2ac73e501b7883381026f3c608.tar.bz2
opensim-SC-756d53db5e9c7a2ac73e501b7883381026f3c608.tar.xz
keyframe. Don't use group UpdateRotation since this enqueues a terse
update and we are sending them imediatly
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index edf2bef..995060b 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -544,8 +544,10 @@ namespace OpenSim.Region.Framework.Scenes
544 m_nextPosition = (Vector3)m_currentFrame.Position; 544 m_nextPosition = (Vector3)m_currentFrame.Position;
545 m_group.AbsolutePosition = m_nextPosition; 545 m_group.AbsolutePosition = m_nextPosition;
546 546
547 m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation); 547 // we are sending imediate updates, no doing force a extra terseUpdate
548// m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
548 549
550 m_group.RootPart.RotationOffset = (Quaternion)m_currentFrame.Rotation;
549 m_frames.RemoveAt(0); 551 m_frames.RemoveAt(0);
550 if (m_frames.Count > 0) 552 if (m_frames.Count > 0)
551 m_currentFrame = m_frames[0]; 553 m_currentFrame = m_frames[0];
@@ -613,7 +615,9 @@ namespace OpenSim.Region.Framework.Scenes
613 // assuming w is a dependente var 615 // assuming w is a dependente var
614 616
615 { 617 {
616 m_group.UpdateGroupRotationR(step); 618// m_group.UpdateGroupRotationR(step);
619 m_group.RootPart.RotationOffset = step;
620
617 //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2); 621 //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
618 update = true; 622 update = true;
619 } 623 }