aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLAssetData.cs
diff options
context:
space:
mode:
authorMelanie2009-10-08 08:07:38 +0100
committerMelanie2009-10-08 08:07:38 +0100
commitfe679be9e76190ac0dc8892469787e63a7a48b5c (patch)
tree220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Data/MySQL/MySQLAssetData.cs
parentstore owner_uuid in the region table (diff)
parentOne last attempt at tunning the locking/no locking behaviour. The previous on... (diff)
downloadopensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip
opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz
opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2
opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz
Merge branch 'htb-throttle'
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs6
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 }