diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs index 44461df..e49e225 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.DataStore.MonoSqlite | |||
50 | private SqliteDataAdapter primDa; | 50 | private SqliteDataAdapter primDa; |
51 | private SqliteDataAdapter shapeDa; | 51 | private SqliteDataAdapter shapeDa; |
52 | private SqliteDataAdapter terrainDa; | 52 | private SqliteDataAdapter terrainDa; |
53 | private String connectionString; | 53 | private String m_connectionString; |
54 | 54 | ||
55 | /*********************************************************************** | 55 | /*********************************************************************** |
56 | * | 56 | * |
@@ -58,14 +58,14 @@ namespace OpenSim.DataStore.MonoSqlite | |||
58 | * | 58 | * |
59 | **********************************************************************/ | 59 | **********************************************************************/ |
60 | 60 | ||
61 | public void Initialise(string dbfile, string dbname) | 61 | public void Initialise(string connectionString) |
62 | { | 62 | { |
63 | connectionString = "URI=file:" + dbfile + ",version=3"; | 63 | m_connectionString = connectionString; |
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: " + connectionString); |
68 | SqliteConnection conn = new SqliteConnection(connectionString); | 68 | SqliteConnection conn = new SqliteConnection(m_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,7 +266,7 @@ namespace OpenSim.DataStore.MonoSqlite | |||
266 | 266 | ||
267 | // the following is an work around for .NET. The perf | 267 | // the following is an work around for .NET. The perf |
268 | // issues associated with it aren't as bad as you think. | 268 | // issues associated with it aren't as bad as you think. |
269 | SqliteConnection conn = new SqliteConnection(connectionString); | 269 | SqliteConnection conn = new SqliteConnection(m_connectionString); |
270 | conn.Open(); | 270 | conn.Open(); |
271 | MainLog.Instance.Verbose("DATASTORE", "Storing terrain revision r" + revision.ToString()); | 271 | MainLog.Instance.Verbose("DATASTORE", "Storing terrain revision r" + revision.ToString()); |
272 | String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" + | 272 | String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" + |
@@ -288,7 +288,7 @@ namespace OpenSim.DataStore.MonoSqlite | |||
288 | terret.Initialize(); | 288 | terret.Initialize(); |
289 | // the following is an work around for .NET. The perf | 289 | // the following is an work around for .NET. The perf |
290 | // issues associated with it aren't as bad as you think. | 290 | // issues associated with it aren't as bad as you think. |
291 | SqliteConnection conn = new SqliteConnection(connectionString); | 291 | SqliteConnection conn = new SqliteConnection(m_connectionString); |
292 | conn.Open(); | 292 | conn.Open(); |
293 | String sql = "select RegionUUID, Revision, Heightfield from terrain" + | 293 | String sql = "select RegionUUID, Revision, Heightfield from terrain" + |
294 | " where RegionUUID=:RegionUUID order by Revision desc"; | 294 | " where RegionUUID=:RegionUUID order by Revision desc"; |
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs index 4e1f71e..657cfab 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.DataStore.NullStorage | |||
36 | { | 36 | { |
37 | public class NullDataStore : IRegionDataStore | 37 | public class NullDataStore : IRegionDataStore |
38 | { | 38 | { |
39 | public void Initialise(string dbfile, string dbname) | 39 | public void Initialise(string dbfile) |
40 | { | 40 | { |
41 | return; | 41 | return; |
42 | } | 42 | } |