aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTextureHandler.cs
diff options
context:
space:
mode:
authorDiva Canto2011-05-02 08:48:55 -0700
committerDiva Canto2011-05-02 08:48:55 -0700
commit10180760b741edf22cec23db0ec490669407425f (patch)
tree66f52dc38657213e03470aab161a0d2ffa3fffe6 /OpenSim/Capabilities/Handlers/GetTextureHandler.cs
parentStart to drill down on GetTexture. Read the config and do different things. (diff)
downloadopensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.zip
opensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.tar.gz
opensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.tar.bz2
opensim-SC_OLD-10180760b741edf22cec23db0ec490669407425f.tar.xz
Works!
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTextureHandler.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTextureHandler.cs
index 00186ee..00ff3d0 100644
--- a/OpenSim/Capabilities/Handlers/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTextureHandler.cs
@@ -67,13 +67,14 @@ namespace OpenSim.Capabilities.Handlers
67 67
68 public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 68 public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
69 { 69 {
70 //m_log.DebugFormat("[GETTEXTURE]: called in {0}", m_scene.RegionInfo.RegionName);
71 70
72 // Try to parse the texture ID from the request URL 71 // Try to parse the texture ID from the request URL
73 NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); 72 NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
74 string textureStr = query.GetOne("texture_id"); 73 string textureStr = query.GetOne("texture_id");
75 string format = query.GetOne("format"); 74 string format = query.GetOne("format");
76 75
76 m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
77
77 if (m_assetService == null) 78 if (m_assetService == null)
78 { 79 {
79 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service"); 80 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");