move keyframemotion.copy from sop.copy to sog.copy, where there is

newgroup information avaiable.

3 files changed, 8 insertions, 4 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;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index df4bd0d..bc0f5b6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2159,6 +2159,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
+            
 
             if (userExposed)
                 dupe.m_rootPart.TrimPermissions();
@@ -2209,6 +2210,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (userExposed)
                     newPart.ApplyPhysics((uint)newPart.Flags,newPart.VolumeDetectActive,true);
 //                }
+                // copy keyframemotion
+                if (part.KeyframeMotion != null)
+                    newPart.KeyframeMotion = part.KeyframeMotion.Copy(dupe);
             }
 
             if (userExposed)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4788a24..56d289f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2110,8 +2110,8 @@ namespace OpenSim.Region.Framework.Scenes
             Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
             dupe.Shape.ExtraParams = extraP;
 
-            if (KeyframeMotion != null)
-                dupe.KeyframeMotion = KeyframeMotion.Copy(null);
+            // safeguard  actual copy is done in sog.copy
+            dupe.KeyframeMotion = null;
 
             if (userExposed)
             {