* Added a sanity check for missing asset data in LLClientView

* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata

1 files changed, 15 insertions, 2 deletions

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 212f41d..3e64e47 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -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