aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/KeyframeMotion.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 80ee510..bf20c32 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -497,7 +497,7 @@ namespace OpenSim.Region.Framework.Scenes
497 497
498 m_group.RootPart.Velocity = Vector3.Zero; 498 m_group.RootPart.Velocity = Vector3.Zero;
499 m_group.RootPart.AngularVelocity = Vector3.Zero; 499 m_group.RootPart.AngularVelocity = Vector3.Zero;
500 m_skippedUpdates = 1000; 500// m_skippedUpdates = 1000;
501// m_group.SendGroupRootTerseUpdate(); 501// m_group.SendGroupRootTerseUpdate();
502 m_group.RootPart.ScheduleTerseUpdate(); 502 m_group.RootPart.ScheduleTerseUpdate();
503 m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId); 503 m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
@@ -521,7 +521,7 @@ namespace OpenSim.Region.Framework.Scenes
521 return; 521 return;
522 if (m_running && !m_waitingCrossing) 522 if (m_running && !m_waitingCrossing)
523 StartTimer(); 523 StartTimer();
524 m_skippedUpdates = 1000; 524// m_skippedUpdates = 1000;
525 } 525 }
526 } 526 }
527 527
@@ -652,10 +652,10 @@ namespace OpenSim.Region.Framework.Scenes
652 m_frames.Clear(); 652 m_frames.Clear();
653 } 653 }
654 654
655 [NonSerialized()] Vector3 m_lastPosUpdate; 655// [NonSerialized()] Vector3 m_lastPosUpdate;
656 [NonSerialized()] Quaternion m_lastRotationUpdate; 656// [NonSerialized()] Quaternion m_lastRotationUpdate;
657 [NonSerialized()] Vector3 m_currentVel; 657 [NonSerialized()] Vector3 m_currentVel;
658 [NonSerialized()] int m_skippedUpdates; 658// [NonSerialized()] int m_skippedUpdates;
659 [NonSerialized()] double m_lasttickMS; 659 [NonSerialized()] double m_lasttickMS;
660 660
661 private void DoOnTimer(double tickDuration) 661 private void DoOnTimer(double tickDuration)
@@ -669,14 +669,14 @@ namespace OpenSim.Region.Framework.Scenes
669 if (m_group == null) 669 if (m_group == null)
670 return; 670 return;
671 671
672 bool update = false; 672// bool update = false;
673 673
674 if (m_selected) 674 if (m_selected)
675 { 675 {
676 if (m_group.RootPart.Velocity != Vector3.Zero) 676 if (m_group.RootPart.Velocity != Vector3.Zero)
677 { 677 {
678 m_group.RootPart.Velocity = Vector3.Zero; 678 m_group.RootPart.Velocity = Vector3.Zero;
679 m_skippedUpdates = 1000; 679// m_skippedUpdates = 1000;
680// m_group.SendGroupRootTerseUpdate(); 680// m_group.SendGroupRootTerseUpdate();
681 m_group.RootPart.ScheduleTerseUpdate(); 681 m_group.RootPart.ScheduleTerseUpdate();
682 } 682 }
@@ -690,7 +690,7 @@ namespace OpenSim.Region.Framework.Scenes
690 // retry to set the position that evtually caused the outbound 690 // retry to set the position that evtually caused the outbound
691 // if still outside region this will call startCrossing below 691 // if still outside region this will call startCrossing below
692 m_isCrossing = false; 692 m_isCrossing = false;
693 m_skippedUpdates = 1000; 693// m_skippedUpdates = 1000;
694 m_group.AbsolutePosition = m_nextPosition; 694 m_group.AbsolutePosition = m_nextPosition;
695 695
696 if (!m_isCrossing) 696 if (!m_isCrossing)
@@ -724,7 +724,7 @@ namespace OpenSim.Region.Framework.Scenes
724 724
725 m_currentFrame.TimeMS += (int)tickDuration; 725 m_currentFrame.TimeMS += (int)tickDuration;
726 m_lasttickMS = nowMS - 50f; 726 m_lasttickMS = nowMS - 50f;
727 update = true; 727// update = true;
728 } 728 }
729 729
730 int elapsed = (int)(nowMS - m_lasttickMS); 730 int elapsed = (int)(nowMS - m_lasttickMS);
@@ -761,7 +761,7 @@ namespace OpenSim.Region.Framework.Scenes
761 else 761 else
762 m_group.RootPart.Velocity = Vector3.Zero; 762 m_group.RootPart.Velocity = Vector3.Zero;
763 } 763 }
764 update = true; 764// update = true;
765 } 765 }
766 else 766 else
767 { 767 {
@@ -858,7 +858,7 @@ namespace OpenSim.Region.Framework.Scenes
858 if (m_group.RootPart.Velocity != Vector3.Zero) 858 if (m_group.RootPart.Velocity != Vector3.Zero)
859 { 859 {
860 m_group.RootPart.Velocity = Vector3.Zero; 860 m_group.RootPart.Velocity = Vector3.Zero;
861 m_skippedUpdates = 1000; 861// m_skippedUpdates = 1000;
862// m_group.SendGroupRootTerseUpdate(); 862// m_group.SendGroupRootTerseUpdate();
863 m_group.RootPart.ScheduleTerseUpdate(); 863 m_group.RootPart.ScheduleTerseUpdate();
864 } 864 }
@@ -871,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes
871 if (m_group != null) 871 if (m_group != null)
872 { 872 {
873 m_group.RootPart.Velocity = Vector3.Zero; 873 m_group.RootPart.Velocity = Vector3.Zero;
874 m_skippedUpdates = 1000; 874// m_skippedUpdates = 1000;
875// m_group.SendGroupRootTerseUpdate(); 875// m_group.SendGroupRootTerseUpdate();
876 m_group.RootPart.ScheduleTerseUpdate(); 876 m_group.RootPart.ScheduleTerseUpdate();
877 877