aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs9
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs17
2 files changed, 7 insertions, 19 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 94e2da4..a22dc0a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -253,12 +253,14 @@ namespace OpenSim.Data.MySQL
253 } 253 }
254 254
255 /// <summary> 255 /// <summary>
256 /// check if the asset UUID exist in database 256 /// Check if the asset exists in the database
257 /// </summary> 257 /// </summary>
258 /// <param name="uuid">The asset UUID</param> 258 /// <param name="uuid">The asset UUID</param>
259 /// <returns>true if exist.</returns> 259 /// <returns>true if it exists, false otherwise.</returns>
260 override public bool ExistsAsset(UUID uuid) 260 override public bool ExistsAsset(UUID uuid)
261 { 261 {
262// m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
263
262 bool assetExists = false; 264 bool assetExists = false;
263 265
264 lock (m_dbLock) 266 lock (m_dbLock)
@@ -275,7 +277,10 @@ namespace OpenSim.Data.MySQL
275 using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) 277 using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
276 { 278 {
277 if (dbReader.Read()) 279 if (dbReader.Read())
280 {
281// m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
278 assetExists = true; 282 assetExists = true;
283 }
279 } 284 }
280 } 285 }
281 catch (Exception e) 286 catch (Exception e)
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index cdaf5b7..b9228d1 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -78,23 +78,6 @@ namespace OpenSim.Data.MySQL
78 // 78 //
79 Migration m = new Migration(dbcon, Assembly, "RegionStore"); 79 Migration m = new Migration(dbcon, Assembly, "RegionStore");
80 m.Update(); 80 m.Update();
81
82 // Clean dropped attachments
83 //
84 try
85 {
86 using (MySqlCommand cmd = dbcon.CreateCommand())
87 {
88 cmd.CommandText = "delete from prims, primshapes using prims " +
89 "left join primshapes on prims.uuid = primshapes.uuid " +
90 "where PCode = 9 and State <> 0";
91 ExecuteNonQuery(cmd);
92 }
93 }
94 catch (MySqlException ex)
95 {
96 m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message);
97 }
98 } 81 }
99 } 82 }
100 83