aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorteravus2013-01-21 21:32:48 -0500
committerteravus2013-01-21 21:32:48 -0500
commit89676b8a48c30647f0150c7e2b0da0ba6c932265 (patch)
treec8fe188a36b6345ae07839d37fb37a5fd71e12a3
parent* Fix notecard loading - If the notecard name is formatted like a UUID but is... (diff)
downloadopensim-SC_OLD-89676b8a48c30647f0150c7e2b0da0ba6c932265.zip
opensim-SC_OLD-89676b8a48c30647f0150c7e2b0da0ba6c932265.tar.gz
opensim-SC_OLD-89676b8a48c30647f0150c7e2b0da0ba6c932265.tar.bz2
opensim-SC_OLD-89676b8a48c30647f0150c7e2b0da0ba6c932265.tar.xz
* The fallthrough of FetchTexture was no longer resulting in a 404 response on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 6437d0b..f667b8f 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -176,8 +176,17 @@ namespace OpenSim.Capabilities.Handlers
176 return true; 176 return true;
177 } 177 }
178 178
179 response = new Hashtable();
180
181 response["int_response_code"] = 404;
182 response["str_response_string"] = "not found";
183 response["content_type"] = "text/plain";
184 response["keepalive"] = false;
185 response["reusecontext"] = false;
186 response["int_bytes"] = 0;
187 //WriteTextureData(request,response,null,format);
179 // not found 188 // not found
180// m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found"); 189 //m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
181 return true; 190 return true;
182 } 191 }
183 192