diff options
author | Melanie | 2013-02-28 21:20:07 +0000 |
---|---|---|
committer | Melanie | 2013-02-28 21:20:07 +0000 |
commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /OpenSim/Data/MySQL/MySQLXAssetData.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
download | opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLXAssetData.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 9a50373..d561c89 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
@@ -204,14 +204,18 @@ namespace OpenSim.Data.MySQL | |||
204 | if (asset.Name.Length > 64) | 204 | if (asset.Name.Length > 64) |
205 | { | 205 | { |
206 | assetName = asset.Name.Substring(0, 64); | 206 | assetName = asset.Name.Substring(0, 64); |
207 | m_log.Warn("[XASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add"); | 207 | m_log.WarnFormat( |
208 | "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", | ||
209 | asset.Name, asset.ID, asset.Name.Length, assetName.Length); | ||
208 | } | 210 | } |
209 | 211 | ||
210 | string assetDescription = asset.Description; | 212 | string assetDescription = asset.Description; |
211 | if (asset.Description.Length > 64) | 213 | if (asset.Description.Length > 64) |
212 | { | 214 | { |
213 | assetDescription = asset.Description.Substring(0, 64); | 215 | assetDescription = asset.Description.Substring(0, 64); |
214 | m_log.Warn("[XASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add"); | 216 | m_log.WarnFormat( |
217 | "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", | ||
218 | asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); | ||
215 | } | 219 | } |
216 | 220 | ||
217 | if (m_enableCompression) | 221 | if (m_enableCompression) |