aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
-rw-r--r--OpenSim/Framework/AssetBase.cs17
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
289 289
290 public string ContentType 290 public string ContentType
291 { 291 {
292 get { return m_content_type; } 292 get
293 set { m_content_type = value; } 293 {
294 if (!String.IsNullOrEmpty(m_content_type))
295 return m_content_type;
296 else
297 return SLUtil.SLAssetTypeToContentType(m_type);
298 }
299 set
300 {
301 m_content_type = value;
302
303 sbyte type = (sbyte)SLUtil.ContentTypeToSLAssetType(value);
304 if (type != -1)
305 m_type = type;
306 }
294 } 307 }
295 308
296 public byte[] SHA1 309 public byte[] SHA1