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/Data/SQLite | |
| 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/Data/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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) |