From 845a390e9308f6b6823c85ac319ecb211f968d4b Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sat, 20 Feb 2010 16:21:13 -0800
Subject: * 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

---
 OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Server/Handlers')

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index fe0da0b..43c1693 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Server.Handlers.Asset
 
                     httpResponse.StatusCode = (int)HttpStatusCode.OK;
                     httpResponse.ContentType =
-                            ServerUtils.SLAssetTypeToContentType(metadata.Type);
+                            SLUtil.SLAssetTypeToContentType(metadata.Type);
                 }
                 else
                 {
@@ -111,7 +111,7 @@ namespace OpenSim.Server.Handlers.Asset
 
                     httpResponse.StatusCode = (int)HttpStatusCode.OK;
                     httpResponse.ContentType =
-                            ServerUtils.SLAssetTypeToContentType(asset.Type);
+                            SLUtil.SLAssetTypeToContentType(asset.Type);
                 }
                 else
                 {
-- 
cgit v1.1