aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-08-30 01:30:56 +0100
committerUbitUmarov2012-08-30 01:30:56 +0100
commita7281003d85b6e9620d02387d4d9a42dcae27b24 (patch)
tree315c2f52f2f66894b3d544bba33c47b4c3101336 /OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC_OLD-a7281003d85b6e9620d02387d4d9a42dcae27b24.zip
opensim-SC_OLD-a7281003d85b6e9620d02387d4d9a42dcae27b24.tar.gz
opensim-SC_OLD-a7281003d85b6e9620d02387d4d9a42dcae27b24.tar.bz2
opensim-SC_OLD-a7281003d85b6e9620d02387d4d9a42dcae27b24.tar.xz
move keyframemotion.copy from sop.copy to sog.copy, where there is
newgroup information avaiable.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/KeyframeMotion.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs4
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
272 newmotion.m_basePosition = m_basePosition; 272 newmotion.m_basePosition = m_basePosition;
273 newmotion.m_baseRotation = m_baseRotation; 273 newmotion.m_baseRotation = m_baseRotation;
274 274
275 newmotion.m_currentFrame = m_currentFrame;
276
277 if (m_selected) 275 if (m_selected)
278 newmotion.m_serializedPosition = m_serializedPosition; 276 newmotion.m_serializedPosition = m_serializedPosition;
279 else 277 else
@@ -284,6 +282,8 @@ namespace OpenSim.Region.Framework.Scenes
284 newmotion.m_serializedPosition = m_serializedPosition; 282 newmotion.m_serializedPosition = m_serializedPosition;
285 } 283 }
286 284
285 newmotion.m_currentFrame = m_currentFrame;
286
287 newmotion.m_iterations = m_iterations; 287 newmotion.m_iterations = m_iterations;
288 newmotion.m_running = m_running; 288 newmotion.m_running = m_running;
289 289