diff options
author | Melanie | 2013-02-12 03:15:40 +0100 |
---|---|---|
committer | Melanie | 2013-02-12 03:15:40 +0100 |
commit | 14c064c65da3d9cce045664f83daaeb7a79edcdd (patch) | |
tree | 9b21d8a9022750c84e8f90a7440d4ba2830d3ead /OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |
parent | Revert "Use actual time dilation for unqueued updates" (diff) | |
download | opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.zip opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.gz opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.bz2 opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.xz |
Revert "Push updates from keyframe directly to the front of the output queue rather"
This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/KeyframeMotion.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 722c031..75b16dc 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
@@ -417,7 +417,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
417 | 417 | ||
418 | m_group.RootPart.Velocity = Vector3.Zero; | 418 | m_group.RootPart.Velocity = Vector3.Zero; |
419 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 419 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
420 | m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate); | 420 | m_group.SendGroupRootTerseUpdate(); |
421 | // m_group.RootPart.ScheduleTerseUpdate(); | 421 | // m_group.RootPart.ScheduleTerseUpdate(); |
422 | m_frames.Clear(); | 422 | m_frames.Clear(); |
423 | } | 423 | } |
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
429 | 429 | ||
430 | m_group.RootPart.Velocity = Vector3.Zero; | 430 | m_group.RootPart.Velocity = Vector3.Zero; |
431 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 431 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
432 | m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate); | 432 | m_group.SendGroupRootTerseUpdate(); |
433 | // m_group.RootPart.ScheduleTerseUpdate(); | 433 | // m_group.RootPart.ScheduleTerseUpdate(); |
434 | 434 | ||
435 | } | 435 | } |
@@ -551,7 +551,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
551 | if (m_group.RootPart.Velocity != Vector3.Zero) | 551 | if (m_group.RootPart.Velocity != Vector3.Zero) |
552 | { | 552 | { |
553 | m_group.RootPart.Velocity = Vector3.Zero; | 553 | m_group.RootPart.Velocity = Vector3.Zero; |
554 | m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate); | 554 | m_group.SendGroupRootTerseUpdate(); |
555 | 555 | ||
556 | } | 556 | } |
557 | return; | 557 | return; |
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
695 | 695 | ||
696 | if (update) | 696 | if (update) |
697 | { | 697 | { |
698 | m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate); | 698 | m_group.SendGroupRootTerseUpdate(); |
699 | } | 699 | } |
700 | } | 700 | } |
701 | 701 | ||
@@ -731,7 +731,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
731 | if (m_group.RootPart.Velocity != Vector3.Zero) | 731 | if (m_group.RootPart.Velocity != Vector3.Zero) |
732 | { | 732 | { |
733 | m_group.RootPart.Velocity = Vector3.Zero; | 733 | m_group.RootPart.Velocity = Vector3.Zero; |
734 | m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate); | 734 | m_group.SendGroupRootTerseUpdate(); |
735 | // m_group.RootPart.ScheduleTerseUpdate(); | 735 | // m_group.RootPart.ScheduleTerseUpdate(); |
736 | } | 736 | } |
737 | } | 737 | } |
@@ -743,7 +743,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
743 | if (m_group != null) | 743 | if (m_group != null) |
744 | { | 744 | { |
745 | m_group.RootPart.Velocity = Vector3.Zero; | 745 | m_group.RootPart.Velocity = Vector3.Zero; |
746 | m_group.SendGroupRootTerseUpdate(PrimUpdateFlags.Immediate); | 746 | m_group.SendGroupRootTerseUpdate(); |
747 | // m_group.RootPart.ScheduleTerseUpdate(); | 747 | // m_group.RootPart.ScheduleTerseUpdate(); |
748 | 748 | ||
749 | if (m_running) | 749 | if (m_running) |