aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorBlueWall2015-03-04 19:40:31 -0500
committerBlueWall2015-03-04 19:40:31 -0500
commit7adeb43a885e5093a2edfc26742a0d739491b6ad (patch)
tree9a5dce5ebd1237376de1fe76fb5d1b12d74aba78 /OpenSim/Framework
parentMerge branch 'master' of /team/src/opensim (diff)
parentAlter the migrations so that it is a no-op as the columns are unused and the ... (diff)
downloadopensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.zip
opensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.tar.gz
opensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.tar.bz2
opensim-SC_OLD-7adeb43a885e5093a2edfc26742a0d739491b6ad.tar.xz
Merge branch 'master' of /team/src/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AssetBase.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 0c1fdda..153a1d0 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -51,7 +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 = 128; 54 public static readonly int MAX_ASSET_DESC = 64;
55 55
56 /// <summary> 56 /// <summary>
57 /// Data of the Asset 57 /// Data of the Asset