diff options
author | Melanie | 2012-11-15 00:43:26 +0000 |
---|---|---|
committer | Melanie | 2012-11-15 00:43:26 +0000 |
commit | 06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e (patch) | |
tree | 845198db417e19540641316f7a8a09c8169e7086 /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Added AssemblyInfos in the OpenSim.Server namespace dlls. (diff) | |
download | opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.zip opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.gz opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.bz2 opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 7f7059b..b94a58c 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -204,7 +204,8 @@ namespace OpenSim.Data.SQLite | |||
204 | /// <returns>True if exist, or false.</returns> | 204 | /// <returns>True if exist, or false.</returns> |
205 | override public bool ExistsAsset(UUID uuid) | 205 | override public bool ExistsAsset(UUID uuid) |
206 | { | 206 | { |
207 | lock (this) { | 207 | lock (this) |
208 | { | ||
208 | using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) | 209 | using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) |
209 | { | 210 | { |
210 | cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString())); | 211 | cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString())); |
@@ -355,12 +356,13 @@ namespace OpenSim.Data.SQLite | |||
355 | { | 356 | { |
356 | lock (this) | 357 | lock (this) |
357 | { | 358 | { |
358 | using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) | 359 | using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) |
359 | { | 360 | { |
360 | cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString())); | 361 | cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString())); |
361 | cmd.ExecuteNonQuery(); | 362 | cmd.ExecuteNonQuery(); |
362 | } | 363 | } |
363 | } | 364 | } |
365 | |||
364 | return true; | 366 | return true; |
365 | } | 367 | } |
366 | 368 | ||