diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs index dcf06fe..0cb3bf3 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | |||
@@ -240,6 +240,9 @@ namespace OpenSim.DataStore.MonoSqliteStorage | |||
240 | 240 | ||
241 | private SceneObjectPart buildPrim(DataRow row) | 241 | private SceneObjectPart buildPrim(DataRow row) |
242 | { | 242 | { |
243 | // TODO: this doesn't work yet because something more | ||
244 | // interesting has to be done to actually get these values | ||
245 | // back out. Not enough time to figure it out yet. | ||
243 | SceneObjectPart prim = new SceneObjectPart(); | 246 | SceneObjectPart prim = new SceneObjectPart(); |
244 | prim.UUID = new LLUUID((string)row["UUID"]); | 247 | prim.UUID = new LLUUID((string)row["UUID"]); |
245 | prim.ParentID = (uint)row["ParentID"]; | 248 | prim.ParentID = (uint)row["ParentID"]; |
@@ -461,17 +464,17 @@ namespace OpenSim.DataStore.MonoSqliteStorage | |||
461 | DataTable shapes = ds.Tables["primshapes"]; | 464 | DataTable shapes = ds.Tables["primshapes"]; |
462 | 465 | ||
463 | // This only supports 1 prim per SceneObjectGroup. Need to fix later | 466 | // This only supports 1 prim per SceneObjectGroup. Need to fix later |
464 | foreach (DataRow primRow in prims.Rows) | 467 | // foreach (DataRow primRow in prims.Rows) |
465 | { | 468 | // { |
466 | SceneObjectGroup group = new SceneObjectGroup(); | 469 | // SceneObjectGroup group = new SceneObjectGroup(); |
467 | SceneObjectPart prim = buildPrim(primRow); | 470 | // SceneObjectPart prim = buildPrim(primRow); |
468 | DataRow shapeRow = shapes.Rows.Find(prim.UUID); | 471 | // DataRow shapeRow = shapes.Rows.Find(prim.UUID); |
469 | if (shapeRow != null) { | 472 | // if (shapeRow != null) { |
470 | prim.Shape = buildShape(shapeRow); | 473 | // prim.Shape = buildShape(shapeRow); |
471 | } | 474 | // } |
472 | group.Children.Add(prim.UUID, prim); | 475 | // group.Children.Add(prim.UUID, prim); |
473 | retvals.Add(group); | 476 | // retvals.Add(group); |
474 | } | 477 | // } |
475 | 478 | ||
476 | MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + " objects"); | 479 | MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + " objects"); |
477 | 480 | ||