diff options
author | John Hurliman | 2009-10-06 02:38:00 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-06 02:38:00 -0700 |
commit | e7c877407f2a72a9519eb53debca5aeef20cded9 (patch) | |
tree | ed67cb35522f357874f6e2749d66fd48493ede80 /OpenSim/Data/MySQL/MySQLAssetData.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr... (diff) | |
download | opensim-SC-e7c877407f2a72a9519eb53debca5aeef20cded9.zip opensim-SC-e7c877407f2a72a9519eb53debca5aeef20cded9.tar.gz opensim-SC-e7c877407f2a72a9519eb53debca5aeef20cded9.tar.bz2 opensim-SC-e7c877407f2a72a9519eb53debca5aeef20cded9.tar.xz |
* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLAssetData.cs')
-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 | } |