From e776dfb1d71ea7f8de37399f84fceb005870e861 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 16 Oct 2009 13:22:45 -0700
Subject: * Changing the "clean dropped attachments" MySQL command to a using
 statement inside a try/catch. This statement times out for me very frequently
 * More verbose logging when zerocoding fails on an outbound packet

---
 OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 839ac7f..6bc8bec 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -68,12 +68,20 @@ namespace OpenSim.Data.MySQL
 
             // Clean dropped attachments
             //
-            MySqlCommand cmd = m_Connection.CreateCommand();
-            cmd.CommandText = "delete from prims, primshapes using prims " +
-                    "left join primshapes on prims.uuid = primshapes.uuid " +
-                    "where PCode = 9 and State <> 0";
-            ExecuteNonQuery(cmd);
-            cmd.Dispose();
+            try
+            {
+                using (MySqlCommand cmd = m_Connection.CreateCommand())
+                {
+                    cmd.CommandText = "delete from prims, primshapes using prims " +
+                            "left join primshapes on prims.uuid = primshapes.uuid " +
+                            "where PCode = 9 and State <> 0";
+                    ExecuteNonQuery(cmd);
+                }
+            }
+            catch (MySqlException ex)
+            {
+                m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message);
+            }
         }
 
         private IDataReader ExecuteReader(MySqlCommand c)
-- 
cgit v1.1