aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2007-08-07 15:13:27 +0000
committerSean Dague2007-08-07 15:13:27 +0000
commitcf3babd988e8fe13f2a9f1eda697c9f22c0acf22 (patch)
tree54f9035195c39b02252a3fa5651210653cebd7f0
parentsome more sqlite stuff. Checking in to get it to another computer (diff)
downloadopensim-SC_OLD-cf3babd988e8fe13f2a9f1eda697c9f22c0acf22.zip
opensim-SC_OLD-cf3babd988e8fe13f2a9f1eda697c9f22c0acf22.tar.gz
opensim-SC_OLD-cf3babd988e8fe13f2a9f1eda697c9f22c0acf22.tar.bz2
opensim-SC_OLD-cf3babd988e8fe13f2a9f1eda697c9f22c0acf22.tar.xz
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
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.Sqlite/SqliteDataStore.cs26
1 files 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 5e571d2..14b239f 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;
12using System.Data; 12using System.Data;
13// Yes, this won't compile on MS, need to deal with that later 13// Yes, this won't compile on MS, need to deal with that later
14using Mono.Data.SqliteClient; 14using Mono.Data.SqliteClient;
15using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
15 16
16namespace OpenSim.DataStore.SqliteStorage 17namespace OpenSim.DataStore.SqliteStorage
17{ 18{
18
19// public class SceneObjectQuery : Predicate
20// {
21// private LLUUID globalIDSearch;
22
23// public SceneObjectQuery(LLUUID find)
24// {
25// globalIDSearch = find;
26// }
27
28// public bool Match(SceneObject obj)
29// {
30// return obj.rootUUID == globalIDSearch;
31// }
32// }
33
34 19
35 public class SqliteDataStore : IRegionDataStore 20 public class SqliteDataStore : IRegionDataStore
36 { 21 {
37 private const primSelect = "select * from prims"; 22 private const string primSelect = "select * from prims";
38 private const shapeSelect = "select * from primshapes"; 23 private const string shapeSelect = "select * from primshapes";
39 24
40 private DataSet ds; 25 private DataSet ds;
41 private IObjectContainer db;
42 26
43 public void Initialise(string dbfile, string dbname) 27 public void Initialise(string dbfile, string dbname)
44 { 28 {
@@ -70,7 +54,7 @@ namespace OpenSim.DataStore.SqliteStorage
70 54
71 } 55 }
72 56
73 public void StoreObject(AllNewGroupSceneObject obj) 57 public void StoreObject(AllNewSceneObjectPart2 obj)
74 { 58 {
75 // TODO: Serializing code 59 // TODO: Serializing code
76 DataTable prims = ds.Tables["prims"]; 60 DataTable prims = ds.Tables["prims"];
@@ -89,7 +73,7 @@ namespace OpenSim.DataStore.SqliteStorage
89 73
90 public void StoreObject(SceneObject obj) 74 public void StoreObject(SceneObject obj)
91 { 75 {
92 foreach (Primitive prim in obj.ChildPrimitives.Values) 76 foreach (Primitive prim in obj.Children.Values)
93 { 77 {
94 addPrim(prim); 78 addPrim(prim);
95 } 79 }