revert changes to asset desc size, my bad.. this field will possible go away in future
parent
94ec5884b7
commit
5202ae7bb4
|
@ -170,14 +170,6 @@ namespace OpenSim.Data.MySQL
|
|||
}
|
||||
|
||||
string assetDescription = asset.Description;
|
||||
if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC)
|
||||
{
|
||||
if(asset.Type == (sbyte) AssetType.Landmark)
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC);
|
||||
else
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
}
|
||||
|
||||
if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
|
||||
{
|
||||
assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
|
|
|
@ -214,12 +214,12 @@ namespace OpenSim.Data.MySQL
|
|||
}
|
||||
|
||||
string assetDescription = asset.Description;
|
||||
if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC)
|
||||
if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
|
||||
{
|
||||
if(asset.Type == (sbyte) AssetType.Landmark)
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC);
|
||||
else
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
m_log.WarnFormat(
|
||||
"[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
|
||||
asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
|
||||
}
|
||||
|
||||
if (m_enableCompression)
|
||||
|
|
|
@ -175,12 +175,12 @@ namespace OpenSim.Data.PGSQL
|
|||
}
|
||||
|
||||
string assetDescription = asset.Description;
|
||||
if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC)
|
||||
if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
|
||||
{
|
||||
if(asset.Type == (sbyte) AssetType.Landmark)
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC);
|
||||
else
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
m_log.WarnFormat(
|
||||
"[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
|
||||
asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
|
||||
}
|
||||
|
||||
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
|
||||
|
|
|
@ -143,12 +143,12 @@ namespace OpenSim.Data.SQLite
|
|||
}
|
||||
|
||||
string assetDescription = asset.Description;
|
||||
if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC)
|
||||
if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
|
||||
{
|
||||
if(asset.Type == (sbyte) AssetType.Landmark)
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC);
|
||||
else
|
||||
assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
m_log.WarnFormat(
|
||||
"[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
|
||||
asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
|
||||
}
|
||||
|
||||
//m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
|
||||
|
|
|
@ -51,8 +51,7 @@ namespace OpenSim.Framework
|
|||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public static readonly int MAX_ASSET_NAME = 64;
|
||||
public static readonly int MAX_ASSET_DESC = 127;
|
||||
public static readonly int MAX_LMASSET_DESC = 255;
|
||||
public static readonly int MAX_ASSET_DESC = 64;
|
||||
|
||||
/// <summary>
|
||||
/// Data of the Asset
|
||||
|
@ -306,18 +305,7 @@ namespace OpenSim.Framework
|
|||
public string Description
|
||||
{
|
||||
get { return m_description; }
|
||||
set
|
||||
{
|
||||
if(value.Length > AssetBase.MAX_LMASSET_DESC)
|
||||
{
|
||||
if(m_type == (sbyte) AssetType.Landmark)
|
||||
m_description = value.Substring(0, AssetBase.MAX_LMASSET_DESC);
|
||||
else
|
||||
m_description = value.Substring(0, AssetBase.MAX_ASSET_DESC);
|
||||
}
|
||||
else
|
||||
m_description = value;
|
||||
}
|
||||
set { m_description = value; }
|
||||
}
|
||||
|
||||
public DateTime CreationDate
|
||||
|
|
Loading…
Reference in New Issue