aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorDiva Canto2009-09-18 19:17:02 -0700
committerDiva Canto2009-09-18 19:17:02 -0700
commit4a55ff88c088ac0019a1106d97a8b8dd173c8cff (patch)
treeaa91fe204048d6f050cffca83168aec61f76a9a2 /OpenSim/Data/SQLite
parentFirst pass at the grid service. (diff)
parentcorrect off-by-one error in save iar command handling (diff)
downloadopensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.zip
opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.gz
opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.bz2
opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 0259ac5..ea076fe 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -416,7 +416,6 @@ namespace OpenSim.Data.SQLite
416 416
417 if (uuid == objID) //is new SceneObjectGroup ? 417 if (uuid == objID) //is new SceneObjectGroup ?
418 { 418 {
419 SceneObjectGroup group = new SceneObjectGroup();
420 prim = buildPrim(primRow); 419 prim = buildPrim(primRow);
421 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString()); 420 DataRow shapeRow = shapes.Rows.Find(prim.UUID.ToString());
422 if (shapeRow != null) 421 if (shapeRow != null)
@@ -430,7 +429,7 @@ namespace OpenSim.Data.SQLite
430 prim.Shape = PrimitiveBaseShape.Default; 429 prim.Shape = PrimitiveBaseShape.Default;
431 } 430 }
432 431
433 group.SetRootPart(prim); 432 SceneObjectGroup group = new SceneObjectGroup(prim);
434 createdObjects.Add(group.UUID, group); 433 createdObjects.Add(group.UUID, group);
435 retvals.Add(group); 434 retvals.Add(group);
436 LoadItems(prim); 435 LoadItems(prim);