From cf3babd988e8fe13f2a9f1eda697c9f22c0acf22 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 7 Aug 2007 15:13:27 +0000 Subject: [PATCH] actually get sqlite stuff to compile. This isn't connected to the main prebuild yet. Going to attempt to get some tracing on current SceneObjects first --- .../SqliteDataStore.cs | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.Sqlite/SqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.Sqlite/SqliteDataStore.cs index 5e571d2916..14b239fbc7 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.Sqlite/SqliteDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.Sqlite/SqliteDataStore.cs @@ -12,33 +12,17 @@ using libsecondlife; using System.Data; // Yes, this won't compile on MS, need to deal with that later using Mono.Data.SqliteClient; +using Primitive = OpenSim.Region.Environment.Scenes.Primitive; namespace OpenSim.DataStore.SqliteStorage { - -// public class SceneObjectQuery : Predicate -// { -// private LLUUID globalIDSearch; - -// public SceneObjectQuery(LLUUID find) -// { -// globalIDSearch = find; -// } - -// public bool Match(SceneObject obj) -// { -// return obj.rootUUID == globalIDSearch; -// } -// } - public class SqliteDataStore : IRegionDataStore { - private const primSelect = "select * from prims"; - private const shapeSelect = "select * from primshapes"; + private const string primSelect = "select * from prims"; + private const string shapeSelect = "select * from primshapes"; private DataSet ds; - private IObjectContainer db; public void Initialise(string dbfile, string dbname) { @@ -70,7 +54,7 @@ namespace OpenSim.DataStore.SqliteStorage } - public void StoreObject(AllNewGroupSceneObject obj) + public void StoreObject(AllNewSceneObjectPart2 obj) { // TODO: Serializing code DataTable prims = ds.Tables["prims"]; @@ -89,7 +73,7 @@ namespace OpenSim.DataStore.SqliteStorage public void StoreObject(SceneObject obj) { - foreach (Primitive prim in obj.ChildPrimitives.Values) + foreach (Primitive prim in obj.Children.Values) { addPrim(prim); }