diff options
| author | UbitUmarov | 2014-07-16 16:22:32 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-16 16:22:32 +0100 |
| commit | 19d33c571d8f48501ecb2409814d5b95b2b4be23 (patch) | |
| tree | 8e08805a71ebea81de75b5805105f325e0defa0f /OpenSim/Data/SQLite | |
| parent | Merge branch 'avination-current' into ubitwork (diff) | |
| parent | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff) | |
| download | opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.zip opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.gz opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.bz2 opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.xz | |
Merge branch 'avination-current' into ubitwork
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) |