diff options
| author | ubit | 2013-01-11 19:19:45 +0100 |
|---|---|---|
| committer | ubit | 2013-01-11 19:19:45 +0100 |
| commit | 6d123ea79321b2032da8f8278d55df26a85eb46d (patch) | |
| tree | ff799f1687e62d710a5555f3d6c6b129de856238 /OpenSim | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | go back bypassing sog updates control (test) (diff) | |
| download | opensim-SC_OLD-6d123ea79321b2032da8f8278d55df26a85eb46d.zip opensim-SC_OLD-6d123ea79321b2032da8f8278d55df26a85eb46d.tar.gz opensim-SC_OLD-6d123ea79321b2032da8f8278d55df26a85eb46d.tar.bz2 opensim-SC_OLD-6d123ea79321b2032da8f8278d55df26a85eb46d.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 43f46d1..5cfba39 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
| @@ -346,8 +346,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 346 | 346 | ||
| 347 | m_group.RootPart.Velocity = Vector3.Zero; | 347 | m_group.RootPart.Velocity = Vector3.Zero; |
| 348 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 348 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
| 349 | // m_group.SendGroupRootTerseUpdate(); | 349 | m_group.SendGroupRootTerseUpdate(); |
| 350 | m_group.RootPart.ScheduleTerseUpdate(); | 350 | // m_group.RootPart.ScheduleTerseUpdate(); |
| 351 | m_frames.Clear(); | 351 | m_frames.Clear(); |
| 352 | } | 352 | } |
| 353 | 353 | ||
| @@ -358,8 +358,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 358 | 358 | ||
| 359 | m_group.RootPart.Velocity = Vector3.Zero; | 359 | m_group.RootPart.Velocity = Vector3.Zero; |
| 360 | m_group.RootPart.AngularVelocity = Vector3.Zero; | 360 | m_group.RootPart.AngularVelocity = Vector3.Zero; |
| 361 | // m_group.SendGroupRootTerseUpdate(); | 361 | m_group.SendGroupRootTerseUpdate(); |
| 362 | m_group.RootPart.ScheduleTerseUpdate(); | 362 | // m_group.RootPart.ScheduleTerseUpdate(); |
| 363 | 363 | ||
| 364 | } | 364 | } |
| 365 | 365 | ||
| @@ -491,8 +491,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 491 | if (m_group.RootPart.Velocity != Vector3.Zero) | 491 | if (m_group.RootPart.Velocity != Vector3.Zero) |
| 492 | { | 492 | { |
| 493 | m_group.RootPart.Velocity = Vector3.Zero; | 493 | m_group.RootPart.Velocity = Vector3.Zero; |
| 494 | // m_group.SendGroupRootTerseUpdate(); | 494 | m_group.SendGroupRootTerseUpdate(); |
| 495 | m_group.RootPart.ScheduleTerseUpdate(); | 495 | // m_group.RootPart.ScheduleTerseUpdate(); |
| 496 | 496 | ||
| 497 | } | 497 | } |
| 498 | m_inOnTimer = false; | 498 | m_inOnTimer = false; |
| @@ -629,8 +629,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 629 | } | 629 | } |
| 630 | 630 | ||
| 631 | if (update) | 631 | if (update) |
| 632 | // m_group.SendGroupRootTerseUpdate(); | 632 | m_group.SendGroupRootTerseUpdate(); |
| 633 | m_group.RootPart.ScheduleTerseUpdate(); | 633 | // m_group.RootPart.ScheduleTerseUpdate(); |
| 634 | 634 | ||
| 635 | 635 | ||
| 636 | } | 636 | } |
| @@ -681,8 +681,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 681 | if (m_group.RootPart.Velocity != Vector3.Zero) | 681 | if (m_group.RootPart.Velocity != Vector3.Zero) |
| 682 | { | 682 | { |
| 683 | m_group.RootPart.Velocity = Vector3.Zero; | 683 | m_group.RootPart.Velocity = Vector3.Zero; |
| 684 | // m_group.SendGroupRootTerseUpdate(); | 684 | m_group.SendGroupRootTerseUpdate(); |
| 685 | m_group.RootPart.ScheduleTerseUpdate(); | 685 | // m_group.RootPart.ScheduleTerseUpdate(); |
| 686 | } | 686 | } |
| 687 | } | 687 | } |
| 688 | 688 | ||
| @@ -693,8 +693,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 693 | if (m_group != null) | 693 | if (m_group != null) |
| 694 | { | 694 | { |
| 695 | m_group.RootPart.Velocity = Vector3.Zero; | 695 | m_group.RootPart.Velocity = Vector3.Zero; |
| 696 | // m_group.SendGroupRootTerseUpdate(); | 696 | m_group.SendGroupRootTerseUpdate(); |
| 697 | m_group.RootPart.ScheduleTerseUpdate(); | 697 | // m_group.RootPart.ScheduleTerseUpdate(); |
| 698 | 698 | ||
| 699 | if (m_running && m_timer != null) | 699 | if (m_running && m_timer != null) |
| 700 | { | 700 | { |