OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comment out load from sqlite as this blows up on object creation right now. 

must run away on vacation.  See you all in a week and change.
afrisby
Sean Dague 2007-08-09 21:26:39 +00:00
parent a2a8de816b
commit 0443723ea5
1 changed files with 14 additions and 11 deletions
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite

25
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -240,6 +240,9 @@ namespace OpenSim.DataStore.MonoSqliteStorage
private SceneObjectPart buildPrim(DataRow row) private SceneObjectPart buildPrim(DataRow row)
{ {
// TODO: this doesn't work yet because something more
// interesting has to be done to actually get these values
// back out. Not enough time to figure it out yet.
SceneObjectPart prim = new SceneObjectPart(); SceneObjectPart prim = new SceneObjectPart();
prim.UUID = new LLUUID((string)row["UUID"]); prim.UUID = new LLUUID((string)row["UUID"]);
prim.ParentID = (uint)row["ParentID"]; prim.ParentID = (uint)row["ParentID"];
@ -461,17 +464,17 @@ namespace OpenSim.DataStore.MonoSqliteStorage
DataTable shapes = ds.Tables["primshapes"]; DataTable shapes = ds.Tables["primshapes"];
// This only supports 1 prim per SceneObjectGroup. Need to fix later // This only supports 1 prim per SceneObjectGroup. Need to fix later
foreach (DataRow primRow in prims.Rows) // foreach (DataRow primRow in prims.Rows)
{ // {
SceneObjectGroup group = new SceneObjectGroup(); // SceneObjectGroup group = new SceneObjectGroup();
SceneObjectPart prim = buildPrim(primRow); // SceneObjectPart prim = buildPrim(primRow);
DataRow shapeRow = shapes.Rows.Find(prim.UUID); // DataRow shapeRow = shapes.Rows.Find(prim.UUID);
if (shapeRow != null) { // if (shapeRow != null) {
prim.Shape = buildShape(shapeRow); // prim.Shape = buildShape(shapeRow);
} // }
group.Children.Add(prim.UUID, prim); // group.Children.Add(prim.UUID, prim);
retvals.Add(group); // retvals.Add(group);
} // }
MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + " objects"); MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + " objects");