From 0443723ea576b67e3abb0292ebfa8bf4bae974dc Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 9 Aug 2007 21:26:39 +0000
Subject: 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.

---
 .../MonoSqliteDataStore.cs                         | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'OpenSim')

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
 
         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();
             prim.UUID = new LLUUID((string)row["UUID"]);
             prim.ParentID = (uint)row["ParentID"];
@@ -461,17 +464,17 @@ namespace OpenSim.DataStore.MonoSqliteStorage
             DataTable shapes = ds.Tables["primshapes"];
             
             // This only supports 1 prim per SceneObjectGroup.  Need to fix later
-            foreach (DataRow primRow in prims.Rows)
-            {
-                SceneObjectGroup group = new SceneObjectGroup();
-                SceneObjectPart prim = buildPrim(primRow);
-                DataRow shapeRow = shapes.Rows.Find(prim.UUID);
-                if (shapeRow != null) {
-                    prim.Shape = buildShape(shapeRow);
-                }
-                group.Children.Add(prim.UUID, prim);
-                retvals.Add(group);
-            }
+//             foreach (DataRow primRow in prims.Rows)
+//             {
+//                 SceneObjectGroup group = new SceneObjectGroup();
+//                 SceneObjectPart prim = buildPrim(primRow);
+//                 DataRow shapeRow = shapes.Rows.Find(prim.UUID);
+//                 if (shapeRow != null) {
+//                     prim.Shape = buildShape(shapeRow);
+//                 }
+//                 group.Children.Add(prim.UUID, prim);
+//                 retvals.Add(group);
+//             }
 
             MainLog.Instance.Verbose("DATASTORE", "Sqlite - LoadObjects found " + " objects");
 
-- 
cgit v1.1