diff options
| author | UbitUmarov | 2017-07-16 00:48:04 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-07-16 00:48:04 +0100 |
| commit | 101413ddd9e8a2a0d82f4e789ccd8f3bb1832666 (patch) | |
| tree | e62d1e60b6d3be8cb62259f4dadbd53e9851848c /OpenSim/Region | |
| parent | Ooopsss (diff) | |
| download | opensim-SC_OLD-101413ddd9e8a2a0d82f4e789ccd8f3bb1832666.zip opensim-SC_OLD-101413ddd9e8a2a0d82f4e789ccd8f3bb1832666.tar.gz opensim-SC_OLD-101413ddd9e8a2a0d82f4e789ccd8f3bb1832666.tar.bz2 opensim-SC_OLD-101413ddd9e8a2a0d82f4e789ccd8f3bb1832666.tar.xz | |
make KFM use scheduled terse updates. This may increase some rubber band, but is needed, and should work better with recent changes on sop terseupdates control
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index d81d8a2..60f5791 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
| @@ -483,8 +483,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 483 | 483 | ||
| 484 | m_group.RootPart.Velocity = Vector3.Zero; | 484 | m_group.RootPart.Velocity = Vector3.Zero; |
| 485 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 485 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
| 486 | m_group.SendGroupRootTerseUpdate(); | 486 | // m_group.SendGroupRootTerseUpdate(); |
| 487 | // m_group.RootPart.ScheduleTerseUpdate(); | 487 | m_group.RootPart.ScheduleTerseUpdate(); |
| 488 | m_frames.Clear(); | 488 | m_frames.Clear(); |
| 489 | } | 489 | } |
| 490 | 490 | ||
| @@ -496,8 +496,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 496 | m_group.RootPart.Velocity = Vector3.Zero; | 496 | m_group.RootPart.Velocity = Vector3.Zero; |
| 497 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 497 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
| 498 | m_skippedUpdates = 1000; | 498 | m_skippedUpdates = 1000; |
| 499 | m_group.SendGroupRootTerseUpdate(); | 499 | // m_group.SendGroupRootTerseUpdate(); |
| 500 | // m_group.RootPart.ScheduleTerseUpdate(); | 500 | m_group.RootPart.ScheduleTerseUpdate(); |
| 501 | } | 501 | } |
| 502 | 502 | ||
| 503 | public void Suspend() | 503 | public void Suspend() |
| @@ -644,8 +644,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 644 | 644 | ||
| 645 | m_group.RootPart.Velocity = Vector3.Zero; | 645 | m_group.RootPart.Velocity = Vector3.Zero; |
| 646 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 646 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
| 647 | m_group.SendGroupRootTerseUpdate(); | 647 | // m_group.SendGroupRootTerseUpdate(); |
| 648 | 648 | m_group.RootPart.ScheduleTerseUpdate(); | |
| 649 | m_frames.Clear(); | 649 | m_frames.Clear(); |
| 650 | } | 650 | } |
| 651 | 651 | ||
| @@ -673,7 +673,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 673 | { | 673 | { |
| 674 | m_group.RootPart.Velocity = Vector3.Zero; | 674 | m_group.RootPart.Velocity = Vector3.Zero; |
| 675 | m_skippedUpdates = 1000; | 675 | m_skippedUpdates = 1000; |
| 676 | m_group.SendGroupRootTerseUpdate(); | 676 | // m_group.SendGroupRootTerseUpdate(); |
| 677 | m_group.RootPart.ScheduleTerseUpdate(); | ||
| 677 | } | 678 | } |
| 678 | return; | 679 | return; |
| 679 | } | 680 | } |
| @@ -797,7 +798,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 797 | m_lastPosUpdate = m_nextPosition; | 798 | m_lastPosUpdate = m_nextPosition; |
| 798 | m_lastRotationUpdate = m_group.GroupRotation; | 799 | m_lastRotationUpdate = m_group.GroupRotation; |
| 799 | m_skippedUpdates = 0; | 800 | m_skippedUpdates = 0; |
| 800 | m_group.SendGroupRootTerseUpdate(); | 801 | // m_group.SendGroupRootTerseUpdate(); |
| 802 | m_group.RootPart.ScheduleTerseUpdate(); | ||
| 801 | } | 803 | } |
| 802 | } | 804 | } |
| 803 | 805 | ||
| @@ -842,8 +844,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 842 | { | 844 | { |
| 843 | m_group.RootPart.Velocity = Vector3.Zero; | 845 | m_group.RootPart.Velocity = Vector3.Zero; |
| 844 | m_skippedUpdates = 1000; | 846 | m_skippedUpdates = 1000; |
| 845 | m_group.SendGroupRootTerseUpdate(); | 847 | // m_group.SendGroupRootTerseUpdate(); |
| 846 | // m_group.RootPart.ScheduleTerseUpdate(); | 848 | m_group.RootPart.ScheduleTerseUpdate(); |
| 847 | } | 849 | } |
| 848 | } | 850 | } |
| 849 | 851 | ||
| @@ -855,8 +857,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 855 | { | 857 | { |
| 856 | m_group.RootPart.Velocity = Vector3.Zero; | 858 | m_group.RootPart.Velocity = Vector3.Zero; |
| 857 | m_skippedUpdates = 1000; | 859 | m_skippedUpdates = 1000; |
| 858 | m_group.SendGroupRootTerseUpdate(); | 860 | // m_group.SendGroupRootTerseUpdate(); |
| 859 | // m_group.RootPart.ScheduleTerseUpdate(); | 861 | m_group.RootPart.ScheduleTerseUpdate(); |
| 860 | 862 | ||
| 861 | if (m_running) | 863 | if (m_running) |
| 862 | { | 864 | { |