diff options
author | Melanie | 2013-06-06 03:03:05 +0100 |
---|---|---|
committer | Melanie | 2013-06-06 03:03:05 +0100 |
commit | 81ad9255b5f44d988bf37cfaf6dc59b05fd744b7 (patch) | |
tree | 201e5f412c3f12e0f94424362fffb0c635343af3 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Committing Avination's Keyframe module. This is not hooked up yet and will do... (diff) | |
download | opensim-SC_OLD-81ad9255b5f44d988bf37cfaf6dc59b05fd744b7.zip opensim-SC_OLD-81ad9255b5f44d988bf37cfaf6dc59b05fd744b7.tar.gz opensim-SC_OLD-81ad9255b5f44d988bf37cfaf6dc59b05fd744b7.tar.bz2 opensim-SC_OLD-81ad9255b5f44d988bf37cfaf6dc59b05fd744b7.tar.xz |
Hook up Keyframe motion to almost everything. Failing to cross a sim border
may yield unexpected results in some cases. No database persistence yet,
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 11 |
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 |