diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 15 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/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 | |||
84 | //New Migration settings | 84 | //New Migration settings |
85 | Migration m = new Migration(conn, Assembly, "RegionStore"); | 85 | Migration m = new Migration(conn, Assembly, "RegionStore"); |
86 | m.Update(); | 86 | m.Update(); |
87 | |||
88 | // Clean dropped attachments | ||
89 | // | ||
90 | try | ||
91 | { | ||
92 | using (SqlCommand cmd = conn.CreateCommand()) | ||
93 | { | ||
94 | 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"; | ||
95 | cmd.ExecuteNonQuery(); | ||
96 | } | ||
97 | } | ||
98 | catch (Exception ex) | ||
99 | { | ||
100 | _Log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message); | ||
101 | } | ||
102 | } | 87 | } |
103 | } | 88 | } |
104 | 89 | ||
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 | |||
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 | ||
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 | |||
946 | 946 | ||
947 | rootPart.ScheduleFullUpdate(); | 947 | rootPart.ScheduleFullUpdate(); |
948 | } | 948 | } |
949 | |||
950 | // m_log.DebugFormat( | ||
951 | // "[InventoryAccessModule]: Rezzed {0} {1} {2} for {3}", | ||
952 | // group.Name, group.LocalId, group.UUID, remoteClient.Name); | ||
949 | } | 953 | } |
950 | 954 | ||
951 | if (!m_Scene.Permissions.BypassPermissions()) | 955 | if (!m_Scene.Permissions.BypassPermissions()) |