aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2011-05-11 20:44:03 -0700
committerDiva Canto2011-05-11 20:44:03 -0700
commite9e4c009b470056dce05cae386860494b0734678 (patch)
tree9c9ab809e48d1d22a945246b19b58024aabeb970 /OpenSim/Server
parentAdd a smidgen of method doc about the fact that item links reuse the asset id... (diff)
downloadopensim-SC_OLD-e9e4c009b470056dce05cae386860494b0734678.zip
opensim-SC_OLD-e9e4c009b470056dce05cae386860494b0734678.tar.gz
opensim-SC_OLD-e9e4c009b470056dce05cae386860494b0734678.tar.bz2
opensim-SC_OLD-e9e4c009b470056dce05cae386860494b0734678.tar.xz
This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index ad74b9b..e8ae05b 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -283,6 +283,7 @@ namespace OpenSim.Server.Handlers.Simulation
283 StreamReader reader = new StreamReader(inputStream, encoding); 283 StreamReader reader = new StreamReader(inputStream, encoding);
284 284
285 string requestBody = reader.ReadToEnd(); 285 string requestBody = reader.ReadToEnd();
286 reader.Close();
286 keysvals.Add("body", requestBody); 287 keysvals.Add("body", requestBody);
287 288
288 httpResponse.StatusCode = 200; 289 httpResponse.StatusCode = 200;
@@ -463,15 +464,13 @@ namespace OpenSim.Server.Handlers.Simulation
463 if (httpRequest.ContentType == "application/x-gzip") 464 if (httpRequest.ContentType == "application/x-gzip")
464 inputStream = new GZipStream(request, CompressionMode.Decompress); 465 inputStream = new GZipStream(request, CompressionMode.Decompress);
465 else 466 else
466 {
467 m_log.DebugFormat("[XXX]: Update called with {0}", httpRequest.ContentType);
468 inputStream = request; 467 inputStream = request;
469 }
470 468
471 Encoding encoding = Encoding.UTF8; 469 Encoding encoding = Encoding.UTF8;
472 StreamReader reader = new StreamReader(inputStream, encoding); 470 StreamReader reader = new StreamReader(inputStream, encoding);
473 471
474 string requestBody = reader.ReadToEnd(); 472 string requestBody = reader.ReadToEnd();
473 reader.Close();
475 keysvals.Add("body", requestBody); 474 keysvals.Add("body", requestBody);
476 475
477 httpResponse.StatusCode = 200; 476 httpResponse.StatusCode = 200;