mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +08:00
* Tweak to region module loading to check for a matching constructor first instead of throwing and catching exceptions
* Commenting out the MySQL startup sequence that cleans out dropped attachments under the advice that it is no longer relevant. If anything, it could be brought back as a database cleanup console command * Updated to the latest libomv 0.8.0-pre. UUID.TryParse() will no longer throw and catch exceptions for most failed UUID parses
This commit is contained in:
@@ -66,22 +66,26 @@ namespace OpenSim.Data.MySQL
|
||||
Migration m = new Migration(m_Connection, assem, "RegionStore");
|
||||
m.Update();
|
||||
|
||||
// NOTE: This is a very slow query that times out on regions with a lot of prims.
|
||||
// I'm told that it is no longer relevant so it's commented out now, but if it
|
||||
// is relevant it should be added as a console command instead of part of the
|
||||
// startup phase
|
||||
// Clean dropped attachments
|
||||
//
|
||||
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);
|
||||
}
|
||||
//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)
|
||||
|
||||
Reference in New Issue
Block a user