From 1bf29d60e1a6839a1b81e0afc656a97f252e13cc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Sep 2011 22:05:05 +0100
Subject: Remove code which was automatically deleting non-root prims from
 scene objects that had previous been attachments.

Looks like this code was accidentally uncommented in e1b5c612 from feb 2010.
Appears to resolve the rest of http://opensimulator.org/mantis/view.php?id=5664
---
 OpenSim/Data/MSSQL/MSSQLSimulationData.cs               | 15 ---------------
 OpenSim/Data/MySQL/MySQLSimulationData.cs               | 17 -----------------
 .../Framework/InventoryAccess/InventoryAccessModule.cs  |  4 ++++
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 78f80e1..bb59bba 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -84,21 +84,6 @@ namespace OpenSim.Data.MSSQL
                 //New Migration settings
                 Migration m = new Migration(conn, Assembly, "RegionStore");
                 m.Update();
-
-                // Clean dropped attachments
-                //
-                try
-                {
-                    using (SqlCommand cmd = conn.CreateCommand())
-                    {
-                        cmd.CommandText = "delete from prims where prims.UUID in (select UUID from primshapes where PCode = 9 and State <> 0); delete from primshapes where PCode = 9 and State <> 0";
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _Log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message);
-                }
             }
         }
 
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index e14d775..96ecea6 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);
-                }
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index fcb7eea..1a591ee 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -946,6 +946,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                             rootPart.ScheduleFullUpdate();
                         }
+
+//                        m_log.DebugFormat(
+//                            "[InventoryAccessModule]: Rezzed {0} {1} {2} for {3}",
+//                            group.Name, group.LocalId, group.UUID, remoteClient.Name);
                     }
 
                     if (!m_Scene.Permissions.BypassPermissions())
-- 
cgit v1.1