ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added a sanity check for missing asset data in LLClientView

Browse Source 
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
This commit is contained in:
John Hurliman
2010-02-20 16:21:13 -08:00
parent eb22fde96c
commit 845a390e93
5 changed files with 212 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/AssetBase.cs
View File

@@ -289,8 +289,21 @@ namespace OpenSim.Framework
public string ContentType
{
get { return m_content_type; }
set { m_content_type = value; }
get
{
if (!String.IsNullOrEmpty(m_content_type))
return m_content_type;
else
return SLUtil.SLAssetTypeToContentType(m_type);
}
set
{
m_content_type = value;
sbyte type = (sbyte)SLUtil.ContentTypeToSLAssetType(value);
if (type != -1)
m_type = type;
}
}
public byte[] SHA1