diff options
| author | Melanie | 2012-09-10 13:53:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-10 13:53:00 +0100 |
| commit | 21c476228a1dbeef1f180a16e9ebb47c8b3fa185 (patch) | |
| tree | 5a2fc5d269eb4711fa2ace11d04731e7dc08607b /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove commented code (diff) | |
| download | opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.zip opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.gz opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.bz2 opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 8e419f9..4af508e 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 | { |