Merge branch 'avination' into careminster

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index e4e6f2c..233e559 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -272,8 +272,6 @@ namespace OpenSim.Region.Framework.Scenes
             newmotion.m_basePosition = m_basePosition;
             newmotion.m_baseRotation = m_baseRotation;
 
-            newmotion.m_currentFrame = m_currentFrame;
-
             if (m_selected)
                 newmotion.m_serializedPosition = m_serializedPosition;
             else
@@ -284,6 +282,8 @@ namespace OpenSim.Region.Framework.Scenes
                     newmotion.m_serializedPosition = m_serializedPosition;
             }
 
+            newmotion.m_currentFrame = m_currentFrame;
+
             newmotion.m_iterations = m_iterations;
             newmotion.m_running = m_running;