diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 5320543..537ec85 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -458,8 +458,6 @@ namespace OpenSim.Data.MySQL | |||
458 | if (prim.ParentUUID == UUID.Zero) | 458 | if (prim.ParentUUID == UUID.Zero) |
459 | { | 459 | { |
460 | objects[prim.UUID] = new SceneObjectGroup(prim); | 460 | objects[prim.UUID] = new SceneObjectGroup(prim); |
461 | if (prim.KeyframeMotion != null) | ||
462 | prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]); | ||
463 | } | 461 | } |
464 | } | 462 | } |
465 | 463 | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 99a6598..76f717d 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -732,9 +732,12 @@ namespace OpenSim.Data.SQLite | |||
732 | } | 732 | } |
733 | 733 | ||
734 | SceneObjectGroup group = new SceneObjectGroup(prim); | 734 | SceneObjectGroup group = new SceneObjectGroup(prim); |
735 | |||
735 | createdObjects.Add(group.UUID, group); | 736 | createdObjects.Add(group.UUID, group); |
736 | retvals.Add(group); | 737 | retvals.Add(group); |
737 | LoadItems(prim); | 738 | LoadItems(prim); |
739 | |||
740 | |||
738 | } | 741 | } |
739 | } | 742 | } |
740 | catch (Exception e) | 743 | catch (Exception e) |