diff options
author | Melanie | 2013-06-13 02:50:39 +0100 |
---|---|---|
committer | Melanie | 2013-06-13 02:50:39 +0100 |
commit | 689969e143dad47fd9c257f9824ec71e3fafc8e6 (patch) | |
tree | c220c0a6a8d8695018c97598700d8885551b139a /OpenSim/Region/Framework | |
parent | Put the "script saved" and "notecard saved" messages back into the bottom (diff) | |
download | opensim-SC-689969e143dad47fd9c257f9824ec71e3fafc8e6.zip opensim-SC-689969e143dad47fd9c257f9824ec71e3fafc8e6.tar.gz opensim-SC-689969e143dad47fd9c257f9824ec71e3fafc8e6.tar.bz2 opensim-SC-689969e143dad47fd9c257f9824ec71e3fafc8e6.tar.xz |
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
Conflicts:
OpenSim/Data/SQLite/SQLiteSimulationData.cs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 0ea4e09..a99261f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1072,6 +1072,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1072 | for (int i = 0; i < parts.Length; i++) | 1072 | for (int i = 0; i < parts.Length; i++) |
1073 | { | 1073 | { |
1074 | SceneObjectPart part = parts[i]; | 1074 | SceneObjectPart part = parts[i]; |
1075 | if (part.KeyframeMotion != null) | ||
1076 | { | ||
1077 | part.KeyframeMotion.UpdateSceneObject(this); | ||
1078 | } | ||
1079 | |||
1075 | if (Object.ReferenceEquals(part, m_rootPart)) | 1080 | if (Object.ReferenceEquals(part, m_rootPart)) |
1076 | continue; | 1081 | continue; |
1077 | 1082 | ||