Resolve merge commits, stage 1

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
         }
 
         /// <summary>
-        /// check if the asset UUID exist in database
+        /// Check if the asset exists in the database
         /// </summary>
         /// <param name="uuid">The asset UUID</param>
-        /// <returns>true if exist.</returns>
+        /// <returns>true if it exists, false otherwise.</returns>
         override public bool ExistsAsset(UUID uuid)
         {
+//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
+
             bool assetExists = false;
 
             lock (m_dbLock)
@@ -275,7 +277,10 @@ namespace OpenSim.Data.MySQL
                             using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                             {
                                 if (dbReader.Read())
+                                {
+//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
                                     assetExists = true;
+                                }
                             }
                         }
                         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
                 //
                 Migration m = new Migration(dbcon, Assembly, "RegionStore");
                 m.Update();
-
-                // Clean dropped attachments
-                //
-                try
-                {
-                    using (MySqlCommand cmd = dbcon.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);
-                }
             }
         }