diff options
author | Justin Clark-Casey (justincc) | 2013-06-13 00:33:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-06-13 00:33:53 +0100 |
commit | 6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0 (patch) | |
tree | aafda20929365322270aa021d776f93726e17911 | |
parent | Make XInventoryServicesConnector properly handle a RESULT = false return for ... (diff) | |
parent | * This fixes having to select and deselect prim to get keyframemotion to star... (diff) | |
download | opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.zip opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.tar.gz opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.tar.bz2 opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 448962a..de52623 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -457,8 +457,6 @@ namespace OpenSim.Data.MySQL | |||
457 | if (prim.ParentUUID == UUID.Zero) | 457 | if (prim.ParentUUID == UUID.Zero) |
458 | { | 458 | { |
459 | objects[prim.UUID] = new SceneObjectGroup(prim); | 459 | objects[prim.UUID] = new SceneObjectGroup(prim); |
460 | if (prim.KeyframeMotion != null) | ||
461 | prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]); | ||
462 | } | 460 | } |
463 | } | 461 | } |
464 | 462 | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 70b76c9..c35bba2 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -732,11 +732,12 @@ namespace OpenSim.Data.SQLite | |||
732 | } | 732 | } |
733 | 733 | ||
734 | SceneObjectGroup group = new SceneObjectGroup(prim); | 734 | SceneObjectGroup group = new SceneObjectGroup(prim); |
735 | if (prim.KeyframeMotion != null) | 735 | |
736 | prim.KeyframeMotion.UpdateSceneObject(group); | ||
737 | createdObjects.Add(group.UUID, group); | 736 | createdObjects.Add(group.UUID, group); |
738 | retvals.Add(group); | 737 | retvals.Add(group); |
739 | LoadItems(prim); | 738 | LoadItems(prim); |
739 | |||
740 | |||
740 | } | 741 | } |
741 | } | 742 | } |
742 | catch (Exception e) | 743 | catch (Exception e) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index da80e4f..7b5fdcb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -763,6 +763,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
763 | for (int i = 0; i < parts.Length; i++) | 763 | for (int i = 0; i < parts.Length; i++) |
764 | { | 764 | { |
765 | SceneObjectPart part = parts[i]; | 765 | SceneObjectPart part = parts[i]; |
766 | if (part.KeyframeMotion != null) | ||
767 | { | ||
768 | part.KeyframeMotion.UpdateSceneObject(this); | ||
769 | } | ||
770 | |||
766 | if (Object.ReferenceEquals(part, m_rootPart)) | 771 | if (Object.ReferenceEquals(part, m_rootPart)) |
767 | continue; | 772 | continue; |
768 | 773 | ||