aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTexture
diff options
context:
space:
mode:
authorMelanie2012-11-17 02:58:14 +0000
committerMelanie2012-11-17 02:58:14 +0000
commit7ad082f7c39ba82adeae3c25ca0befcf983c879d (patch)
tree0e3c488c65ef22b53e4536dd07f46c1467b58f78 /OpenSim/Capabilities/Handlers/GetTexture
parentMerge branch 'master' into careminster (diff)
parentPrevent a buffer overflow in asset receiving (diff)
downloadopensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.zip
opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.gz
opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.bz2
opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index c275d87..6437d0b 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Capabilities.Handlers
68 ret["content_type"] = "text/plain"; 68 ret["content_type"] = "text/plain";
69 ret["keepalive"] = false; 69 ret["keepalive"] = false;
70 ret["reusecontext"] = false; 70 ret["reusecontext"] = false;
71 71 ret["int_bytes"] = 0;
72 string textureStr = (string)request["texture_id"]; 72 string textureStr = (string)request["texture_id"];
73 string format = (string)request["format"]; 73 string format = (string)request["format"];
74 74
@@ -237,6 +237,7 @@ namespace OpenSim.Capabilities.Handlers
237 { 237 {
238 response["int_response_code"] = (int)System.Net.HttpStatusCode.OK; 238 response["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
239 response["bin_response_data"] = texture.Data; 239 response["bin_response_data"] = texture.Data;
240 response["int_bytes"] = texture.Data.Length;
240 } 241 }
241 else 242 else
242 { 243 {
@@ -246,6 +247,7 @@ namespace OpenSim.Capabilities.Handlers
246 byte[] d = new byte[len]; 247 byte[] d = new byte[len];
247 Array.Copy(texture.Data, start, d, 0, len); 248 Array.Copy(texture.Data, start, d, 0, len);
248 response["bin_response_data"] = d; 249 response["bin_response_data"] = d;
250 response["int_bytes"] = len;
249 } 251 }
250// response.Body.Write(texture.Data, start, len); 252// response.Body.Write(texture.Data, start, len);
251 } 253 }
@@ -266,6 +268,8 @@ namespace OpenSim.Capabilities.Handlers
266 response["content_type"] = "image/" + format; 268 response["content_type"] = "image/" + format;
267 269
268 response["bin_response_data"] = texture.Data; 270 response["bin_response_data"] = texture.Data;
271 response["int_bytes"] = texture.Data.Length;
272
269// response.Body.Write(texture.Data, 0, texture.Data.Length); 273// response.Body.Write(texture.Data, 0, texture.Data.Length);
270 } 274 }
271 275