ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2012-11-17 02:58:14 +00:00
parent e4659a83f1 6faa7fc7f9
commit 7ad082f7c3
13 changed files with 261 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ namespace OpenSim.Capabilities.Handlers
ret["content_type"] = "text/plain";
ret["keepalive"] = false;
ret["reusecontext"] = false;
ret["int_bytes"] = 0;
string textureStr = (string)request["texture_id"];
string format = (string)request["format"];
@@ -237,6 +237,7 @@ namespace OpenSim.Capabilities.Handlers
{
response["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
response["bin_response_data"] = texture.Data;
response["int_bytes"] = texture.Data.Length;
}
else
{
@@ -246,6 +247,7 @@ namespace OpenSim.Capabilities.Handlers
byte[] d = new byte[len];
Array.Copy(texture.Data, start, d, 0, len);
response["bin_response_data"] = d;
response["int_bytes"] = len;
}
// response.Body.Write(texture.Data, start, len);
}
@@ -266,6 +268,8 @@ namespace OpenSim.Capabilities.Handlers
response["content_type"] = "image/" + format;
response["bin_response_data"] = texture.Data;
response["int_bytes"] = texture.Data.Length;
// response.Body.Write(texture.Data, 0, texture.Data.Length);
}