diff options
| author | Melanie | 2009-10-08 10:32:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 10:32:15 +0100 |
| commit | f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch) | |
| tree | de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Data | |
| parent | Correct a build break caused by an optimization in trunk (diff) | |
| parent | Remove ThreadTrackerTest. It's no longer relevant because the thread (diff) | |
| download | opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2 opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 8f97440..259e186 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
| @@ -239,10 +239,8 @@ namespace OpenSim.Data.MySQL | |||
| 239 | } | 239 | } |
| 240 | catch (Exception e) | 240 | catch (Exception e) |
| 241 | { | 241 | { |
| 242 | m_log.ErrorFormat( | 242 | m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Attempting reconnect. Error: {2}", |
| 243 | "[ASSETS DB]: " + | 243 | asset.FullID, asset.Name, e.Message); |
| 244 | "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() | ||
| 245 | + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); | ||
| 246 | _dbConnection.Reconnect(); | 244 | _dbConnection.Reconnect(); |
| 247 | } | 245 | } |
| 248 | } | 246 | } |