OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* A better way to handle the last fix (This is in case the viewer provides a list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.

avinationmerge
teravus 2013-01-21 22:08:51 -05:00
parent 6007eae00f
commit be60c0b010
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
View File

@ -99,12 +99,23 @@ namespace OpenSim.Capabilities.Handlers
} }
// OK, we have an array with preferred formats, possibly with only one entry // OK, we have an array with preferred formats, possibly with only one entry
bool foundtexture = false;
foreach (string f in formats) foreach (string f in formats)
{ {
if (FetchTexture(request, ret, textureID, f)) foundtexture = FetchTexture(request, ret, textureID, f);
if (foundtexture)
break; break;
} }
if (!foundtexture)
{
ret["int_response_code"] = 404;
ret["error_status_text"] = "not found";
ret["str_response_string"] = "not found";
ret["content_type"] = "text/plain";
ret["keepalive"] = false;
ret["reusecontext"] = false;
ret["int_bytes"] = 0;
}
} }
else else
{ {
@ -176,18 +187,13 @@ namespace OpenSim.Capabilities.Handlers
return true; return true;
} }
response = new Hashtable(); //response = new Hashtable();
response["int_response_code"] = 404;
response["str_response_string"] = "not found";
response["content_type"] = "text/plain";
response["keepalive"] = false;
response["reusecontext"] = false;
response["int_bytes"] = 0;
//WriteTextureData(request,response,null,format); //WriteTextureData(request,response,null,format);
// not found // not found
//m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found"); //m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
return true; return false;
} }
private void WriteTextureData(Hashtable request, Hashtable response, AssetBase texture, string format) private void WriteTextureData(Hashtable request, Hashtable response, AssetBase texture, string format)