aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a84f6d3..bb7ae7f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1645,6 +1645,12 @@ namespace OpenSim.Region.Framework.Scenes
1645 /// <param name="childPrims"></param> 1645 /// <param name="childPrims"></param>
1646 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children) 1646 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children)
1647 { 1647 {
1648 if (root.KeyframeMotion != null)
1649 {
1650 root.KeyframeMotion.Stop();
1651 root.KeyframeMotion = null;
1652 }
1653
1648 SceneObjectGroup parentGroup = root.ParentGroup; 1654 SceneObjectGroup parentGroup = root.ParentGroup;
1649 if (parentGroup == null) return; 1655 if (parentGroup == null) return;
1650 1656
@@ -1722,6 +1728,11 @@ namespace OpenSim.Region.Framework.Scenes
1722 { 1728 {
1723 if (part != null) 1729 if (part != null)
1724 { 1730 {
1731 if (part.KeyframeMotion != null)
1732 {
1733 part.KeyframeMotion.Stop();
1734 part.KeyframeMotion = null;
1735 }
1725 if (part.ParentGroup.PrimCount != 1) // Skip single 1736 if (part.ParentGroup.PrimCount != 1) // Skip single
1726 { 1737 {
1727 if (part.LinkNum < 2) // Root 1738 if (part.LinkNum < 2) // Root