diff options
| author | Melanie | 2013-06-13 02:49:43 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-13 02:49:43 +0100 |
| commit | 9975c5674c002be0e17db02b589c388b684f63a9 (patch) | |
| tree | aa727252685987781696db21f9eee58dd6b6d023 /OpenSim/Data/SQLite | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.zip opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.tar.gz opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.tar.bz2 opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index c8e48fd..a369b2b 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) |