diff options
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLMigration.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 15 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs index 1aa96c7..c2fecef 100644 --- a/OpenSim/Data/MSSQL/MSSQLMigration.cs +++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MSSQL | |||
88 | cmd.ExecuteNonQuery(); | 88 | cmd.ExecuteNonQuery(); |
89 | } | 89 | } |
90 | } | 90 | } |
91 | catch (Exception ex) | 91 | catch (Exception) |
92 | { | 92 | { |
93 | throw new Exception(sql); | 93 | throw new Exception(sql); |
94 | 94 | ||
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/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs index 1f6994d..a1069c6 100644 --- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | |||
@@ -191,7 +191,7 @@ namespace OpenSim.Data.MSSQL | |||
191 | { | 191 | { |
192 | cmd.ExecuteNonQuery(); | 192 | cmd.ExecuteNonQuery(); |
193 | } | 193 | } |
194 | catch (Exception e) | 194 | catch (Exception) |
195 | { | 195 | { |
196 | return false; | 196 | return false; |
197 | } | 197 | } |