diff options
| author | UbitUmarov | 2013-05-31 23:18:12 +0100 |
|---|---|---|
| committer | UbitUmarov | 2013-05-31 23:18:12 +0100 |
| commit | 8fe2308afcd31abd1c0110fc44e78497ad66c231 (patch) | |
| tree | eba6510acf2087229b53261f80229467df8d1865 /OpenSim/Region/Framework/Scenes | |
| parent | retouch prim stopped condition test (diff) | |
| parent | Fix multi-wear of alpha and tattoo layers. (diff) | |
| download | opensim-SC_OLD-8fe2308afcd31abd1c0110fc44e78497ad66c231.zip opensim-SC_OLD-8fe2308afcd31abd1c0110fc44e78497ad66c231.tar.gz opensim-SC_OLD-8fe2308afcd31abd1c0110fc44e78497ad66c231.tar.bz2 opensim-SC_OLD-8fe2308afcd31abd1c0110fc44e78497ad66c231.tar.xz | |
Merge branch 'avination-current' into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index b102e48..d773ee7 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
| @@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 645 | m_nextPosition = m_group.AbsolutePosition + motionThisFrame; | 645 | m_nextPosition = m_group.AbsolutePosition + motionThisFrame; |
| 646 | m_group.AbsolutePosition = m_nextPosition; | 646 | m_group.AbsolutePosition = m_nextPosition; |
| 647 | 647 | ||
| 648 | m_group.RootPart.Velocity = v; | 648 | //m_group.RootPart.Velocity = v; |
| 649 | update = true; | 649 | update = true; |
| 650 | } | 650 | } |
| 651 | 651 | ||