aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
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/Region/CoreModules
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/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 9d77b19..4bced54 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -514,6 +514,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
514 scene.RegionInfo.RegionID.ToString()); 514 scene.RegionInfo.RegionID.ToString());
515 asset.Data = assetData; 515 asset.Data = assetData;
516 asset.Description = String.Format("URL image : {0}", Url); 516 asset.Description = String.Format("URL image : {0}", Url);
517 if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
518 asset.Description = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
517 asset.Local = false; 519 asset.Local = false;
518 asset.Temporary = ((Disp & DISP_TEMP) != 0); 520 asset.Temporary = ((Disp & DISP_TEMP) != 0);
519 scene.AssetService.Store(asset); 521 scene.AssetService.Store(asset);