Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-09-10 13:53:00 +01:00
20 changed files with 401 additions and 243 deletions

View File

@@ -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)
{