aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2016-11-24 14:39:08 +0000
committerUbitUmarov2016-11-24 14:39:08 +0000
commit5202ae7bb4b3e20aad762811195922da6926a54c (patch)
tree8d77ea056dc7e2af1a2bc5e6e44c7ba40eab027f /OpenSim/Framework
parent fix llRez(AtRoot/Object) error messages on shared code path (diff)
downloadopensim-SC_OLD-5202ae7bb4b3e20aad762811195922da6926a54c.zip
opensim-SC_OLD-5202ae7bb4b3e20aad762811195922da6926a54c.tar.gz
opensim-SC_OLD-5202ae7bb4b3e20aad762811195922da6926a54c.tar.bz2
opensim-SC_OLD-5202ae7bb4b3e20aad762811195922da6926a54c.tar.xz
revert changes to asset desc size, my bad.. this field will possible go away in future
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AssetBase.cs16
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 67239ec..87fd04a 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -51,8 +51,7 @@ namespace OpenSim.Framework
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public static readonly int MAX_ASSET_NAME = 64; 53 public static readonly int MAX_ASSET_NAME = 64;
54 public static readonly int MAX_ASSET_DESC = 127; 54 public static readonly int MAX_ASSET_DESC = 64;
55 public static readonly int MAX_LMASSET_DESC = 255;
56 55
57 /// <summary> 56 /// <summary>
58 /// Data of the Asset 57 /// Data of the Asset
@@ -306,18 +305,7 @@ namespace OpenSim.Framework
306 public string Description 305 public string Description
307 { 306 {
308 get { return m_description; } 307 get { return m_description; }
309 set 308 set { m_description = value; }
310 {
311 if(value.Length > AssetBase.MAX_LMASSET_DESC)
312 {
313 if(m_type == (sbyte) AssetType.Landmark)
314 m_description = value.Substring(0, AssetBase.MAX_LMASSET_DESC);
315 else
316 m_description = value.Substring(0, AssetBase.MAX_ASSET_DESC);
317 }
318 else
319 m_description = value;
320 }
321 } 309 }
322 310
323 public DateTime CreationDate 311 public DateTime CreationDate