diff options
author | Sean Dague | 2007-11-14 16:26:18 +0000 |
---|---|---|
committer | Sean Dague | 2007-11-14 16:26:18 +0000 |
commit | 8eb2a163c8d9b10477cf1bc57ac7ab6c0c75a112 (patch) | |
tree | 44949546f40d6a527afc485e1f6247818fd8daf4 /OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite | |
parent | * ODE removes an unnecessary lock. (diff) | |
download | opensim-SC-8eb2a163c8d9b10477cf1bc57ac7ab6c0c75a112.zip opensim-SC-8eb2a163c8d9b10477cf1bc57ac7ab6c0c75a112.tar.gz opensim-SC-8eb2a163c8d9b10477cf1bc57ac7ab6c0c75a112.tar.bz2 opensim-SC-8eb2a163c8d9b10477cf1bc57ac7ab6c0c75a112.tar.xz |
random shot in the dark
Diffstat (limited to 'OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite')
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs index 60bef13..18be64a 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | |||
@@ -49,8 +49,8 @@ namespace OpenSim.DataStore.MonoSqlite | |||
49 | private DataSet ds; | 49 | private DataSet ds; |
50 | private SqliteDataAdapter primDa; | 50 | private SqliteDataAdapter primDa; |
51 | private SqliteDataAdapter shapeDa; | 51 | private SqliteDataAdapter shapeDa; |
52 | private SqliteConnection conn; | ||
53 | private SqliteDataAdapter terrainDa; | 52 | private SqliteDataAdapter terrainDa; |
53 | private String connectionString; | ||
54 | 54 | ||
55 | /*********************************************************************** | 55 | /*********************************************************************** |
56 | * | 56 | * |
@@ -60,12 +60,12 @@ namespace OpenSim.DataStore.MonoSqlite | |||
60 | 60 | ||
61 | public void Initialise(string dbfile, string dbname) | 61 | public void Initialise(string dbfile, string dbname) |
62 | { | 62 | { |
63 | string connectionString = "URI=file:" + dbfile + ",version=3"; | 63 | connectionString = "URI=file:" + dbfile + ",version=3"; |
64 | 64 | ||
65 | ds = new DataSet(); | 65 | ds = new DataSet(); |
66 | 66 | ||
67 | MainLog.Instance.Verbose("DATASTORE", "Sqlite - connecting: " + dbfile); | 67 | MainLog.Instance.Verbose("DATASTORE", "Sqlite - connecting: " + dbfile); |
68 | conn = new SqliteConnection(connectionString); | 68 | SqliteConnection conn = new SqliteConnection(connectionString); |
69 | 69 | ||
70 | SqliteCommand primSelectCmd = new SqliteCommand(primSelect, conn); | 70 | SqliteCommand primSelectCmd = new SqliteCommand(primSelect, conn); |
71 | primDa = new SqliteDataAdapter(primSelectCmd); | 71 | primDa = new SqliteDataAdapter(primSelectCmd); |
@@ -266,6 +266,7 @@ namespace OpenSim.DataStore.MonoSqlite | |||
266 | 266 | ||
267 | public double[,] LoadTerrain(LLUUID regionID) | 267 | public double[,] LoadTerrain(LLUUID regionID) |
268 | { | 268 | { |
269 | SqliteConnection conn = new SqliteConnection(connectionString); | ||
269 | double[,] terret = new double[256,256]; | 270 | double[,] terret = new double[256,256]; |
270 | terret.Initialize(); | 271 | terret.Initialize(); |
271 | String sql = "select RegionUUID, Revision, Heightfield from terrain" + | 272 | String sql = "select RegionUUID, Revision, Heightfield from terrain" + |