aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLAssetData.cs
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-22 12:04:06 +0300
committerOren Hurvitz2014-04-22 12:18:54 +0300
commit93a9ed2a6d5f6005ae213e2e91f1c79e2fd7f775 (patch)
tree10f801c88be06ec81cd0b8725947d7729ea39c45 /OpenSim/Data/MySQL/MySQLAssetData.cs
parentFixed: when a user logged-in, sometimes he didn't get notified of the Online ... (diff)
downloadopensim-SC_OLD-93a9ed2a6d5f6005ae213e2e91f1c79e2fd7f775.zip
opensim-SC_OLD-93a9ed2a6d5f6005ae213e2e91f1c79e2fd7f775.tar.gz
opensim-SC_OLD-93a9ed2a6d5f6005ae213e2e91f1c79e2fd7f775.tar.bz2
opensim-SC_OLD-93a9ed2a6d5f6005ae213e2e91f1c79e2fd7f775.tar.xz
Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLAssetData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index c96139d..f03e322 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -171,18 +171,18 @@ namespace OpenSim.Data.MySQL
171 dbcon)) 171 dbcon))
172 { 172 {
173 string assetName = asset.Name; 173 string assetName = asset.Name;
174 if (asset.Name.Length > 64) 174 if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
175 { 175 {
176 assetName = asset.Name.Substring(0, 64); 176 assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
177 m_log.WarnFormat( 177 m_log.WarnFormat(
178 "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 178 "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
179 asset.Name, asset.ID, asset.Name.Length, assetName.Length); 179 asset.Name, asset.ID, asset.Name.Length, assetName.Length);
180 } 180 }
181 181
182 string assetDescription = asset.Description; 182 string assetDescription = asset.Description;
183 if (asset.Description.Length > 64) 183 if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
184 { 184 {
185 assetDescription = asset.Description.Substring(0, 64); 185 assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
186 m_log.WarnFormat( 186 m_log.WarnFormat(
187 "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 187 "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
188 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); 188 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);