diff options
| author | John Hurliman | 2009-10-27 01:46:14 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-27 01:46:14 -0700 |
| commit | b498693cff9b044e8ab3c7a88a18e9d67f16461b (patch) | |
| tree | da3ad1c4085eb4c4b16c0ba84d97f5938bc6763e /OpenSim/Data | |
| parent | * Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) t... (diff) | |
| download | opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.zip opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.tar.gz opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.tar.bz2 opensim-SC_OLD-b498693cff9b044e8ab3c7a88a18e9d67f16461b.tar.xz | |
* 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
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index c07963c..a807948 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
| @@ -66,22 +66,26 @@ namespace OpenSim.Data.MySQL | |||
| 66 | Migration m = new Migration(m_Connection, assem, "RegionStore"); | 66 | Migration m = new Migration(m_Connection, assem, "RegionStore"); |
| 67 | m.Update(); | 67 | m.Update(); |
| 68 | 68 | ||
| 69 | // NOTE: This is a very slow query that times out on regions with a lot of prims. | ||
| 70 | // I'm told that it is no longer relevant so it's commented out now, but if it | ||
| 71 | // is relevant it should be added as a console command instead of part of the | ||
| 72 | // startup phase | ||
| 69 | // Clean dropped attachments | 73 | // Clean dropped attachments |
| 70 | // | 74 | // |
| 71 | try | 75 | //try |
| 72 | { | 76 | //{ |
| 73 | using (MySqlCommand cmd = m_Connection.CreateCommand()) | 77 | // using (MySqlCommand cmd = m_Connection.CreateCommand()) |
| 74 | { | 78 | // { |
| 75 | cmd.CommandText = "delete from prims, primshapes using prims " + | 79 | // cmd.CommandText = "delete from prims, primshapes using prims " + |
| 76 | "left join primshapes on prims.uuid = primshapes.uuid " + | 80 | // "left join primshapes on prims.uuid = primshapes.uuid " + |
| 77 | "where PCode = 9 and State <> 0"; | 81 | // "where PCode = 9 and State <> 0"; |
| 78 | ExecuteNonQuery(cmd); | 82 | // ExecuteNonQuery(cmd); |
| 79 | } | 83 | // } |
| 80 | } | 84 | //} |
| 81 | catch (MySqlException ex) | 85 | //catch (MySqlException ex) |
| 82 | { | 86 | //{ |
| 83 | m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message); | 87 | // m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message); |
| 84 | } | 88 | //} |
| 85 | } | 89 | } |
| 86 | 90 | ||
| 87 | private IDataReader ExecuteReader(MySqlCommand c) | 91 | private IDataReader ExecuteReader(MySqlCommand c) |