aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorteravus2013-06-12 18:13:00 -0500
committerteravus2013-06-12 18:13:00 -0500
commit33573003620674f4a4f6c8fadd969c7aa6576a5d (patch)
treec8eb940778a518229db04ecddb466e82232f0876 /OpenSim/Data
parentAfter calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistent... (diff)
downloadopensim-SC_OLD-33573003620674f4a4f6c8fadd969c7aa6576a5d.zip
opensim-SC_OLD-33573003620674f4a4f6c8fadd969c7aa6576a5d.tar.gz
opensim-SC_OLD-33573003620674f4a4f6c8fadd969c7aa6576a5d.tar.bz2
opensim-SC_OLD-33573003620674f4a4f6c8fadd969c7aa6576a5d.tar.xz
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs5
2 files changed, 3 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)