aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorubit2012-08-30 02:35:31 +0200
committerubit2012-08-30 02:35:31 +0200
commite402a249724549e8986fed7c7128a7f2a59d0d57 (patch)
tree743078cb0dbfb96bd110d60f969a6409cffce30c /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentmove keyframemotion.copy from sop.copy to sog.copy, where there is (diff)
downloadopensim-SC-e402a249724549e8986fed7c7128a7f2a59d0d57.zip
opensim-SC-e402a249724549e8986fed7c7128a7f2a59d0d57.tar.gz
opensim-SC-e402a249724549e8986fed7c7128a7f2a59d0d57.tar.bz2
opensim-SC-e402a249724549e8986fed7c7128a7f2a59d0d57.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
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
2110 Array.Copy(Shape.ExtraParams, extraP, extraP.Length); 2110 Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
2111 dupe.Shape.ExtraParams = extraP; 2111 dupe.Shape.ExtraParams = extraP;
2112 2112
2113 if (KeyframeMotion != null) 2113 // safeguard actual copy is done in sog.copy
2114 dupe.KeyframeMotion = KeyframeMotion.Copy(null); 2114 dupe.KeyframeMotion = null;
2115 2115
2116 if (userExposed) 2116 if (userExposed)
2117 { 2117 {