diff options
author | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
commit | a160b44e0766329a6c336adcb804cede39e00fc7 (patch) | |
tree | edf6d5070a0bb9dcba424cf883fe20a7c96af751 /OpenSim/Data/SQLite/SQLiteManager.cs | |
parent | If a transfer request is received for a task inventory item asset, then route... (diff) | |
parent | minor: remove some commented out code and return ScenePresence.UpdatePriority... (diff) | |
download | opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.zip opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2 opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz |
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs index b6d4a1c..7dcd323 100644 --- a/OpenSim/Data/SQLite/SQLiteManager.cs +++ b/OpenSim/Data/SQLite/SQLiteManager.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SQLite; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using log4net; | 32 | using log4net; |
33 | using Mono.Data.Sqlite; | ||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLite |
@@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite | |||
66 | connectionString = "URI=file:GridServerSqlite.db;"; | 66 | connectionString = "URI=file:GridServerSqlite.db;"; |
67 | } | 67 | } |
68 | 68 | ||
69 | dbcon = new SQLiteConnection(connectionString); | 69 | dbcon = new SqliteConnection(connectionString); |
70 | 70 | ||
71 | dbcon.Open(); | 71 | dbcon.Open(); |
72 | } | 72 | } |
@@ -93,11 +93,11 @@ namespace OpenSim.Data.SQLite | |||
93 | /// <returns>A SQLite DB Command</returns> | 93 | /// <returns>A SQLite DB Command</returns> |
94 | public IDbCommand Query(string sql, Dictionary<string, string> parameters) | 94 | public IDbCommand Query(string sql, Dictionary<string, string> parameters) |
95 | { | 95 | { |
96 | SQLiteCommand dbcommand = (SQLiteCommand) dbcon.CreateCommand(); | 96 | SqliteCommand dbcommand = (SqliteCommand) dbcon.CreateCommand(); |
97 | dbcommand.CommandText = sql; | 97 | dbcommand.CommandText = sql; |
98 | foreach (KeyValuePair<string, string> param in parameters) | 98 | foreach (KeyValuePair<string, string> param in parameters) |
99 | { | 99 | { |
100 | SQLiteParameter paramx = new SQLiteParameter(param.Key, param.Value); | 100 | SqliteParameter paramx = new SqliteParameter(param.Key, param.Value); |
101 | dbcommand.Parameters.Add(paramx); | 101 | dbcommand.Parameters.Add(paramx); |
102 | } | 102 | } |
103 | 103 | ||