diff options
author | Diva Canto | 2011-05-11 13:15:27 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-11 13:15:27 -0700 |
commit | 7fa2489a6e2391205b17cde24cdb4cab1accc8bd (patch) | |
tree | e41ef94765b490671d7ad6dfa57b8dfef0f8b8da | |
parent | One more debug message. Don't use this unless your name is nebadon. (diff) | |
download | opensim-SC-7fa2489a6e2391205b17cde24cdb4cab1accc8bd.zip opensim-SC-7fa2489a6e2391205b17cde24cdb4cab1accc8bd.tar.gz opensim-SC-7fa2489a6e2391205b17cde24cdb4cab1accc8bd.tar.bz2 opensim-SC-7fa2489a6e2391205b17cde24cdb4cab1accc8bd.tar.xz |
Revert "Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs."
This reverts commit 5548f837501184d68c352097ad1a1de566e18ca0.
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 46b511d..ad74b9b 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -461,10 +461,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
461 | 461 | ||
462 | Stream inputStream; | 462 | Stream inputStream; |
463 | if (httpRequest.ContentType == "application/x-gzip") | 463 | if (httpRequest.ContentType == "application/x-gzip") |
464 | { | ||
465 | m_log.DebugFormat("[XXX]: Update called with application/x-gzip"); | ||
466 | inputStream = new GZipStream(request, CompressionMode.Decompress); | 464 | inputStream = new GZipStream(request, CompressionMode.Decompress); |
467 | } | ||
468 | else | 465 | else |
469 | { | 466 | { |
470 | m_log.DebugFormat("[XXX]: Update called with {0}", httpRequest.ContentType); | 467 | m_log.DebugFormat("[XXX]: Update called with {0}", httpRequest.ContentType); |
@@ -474,22 +471,8 @@ namespace OpenSim.Server.Handlers.Simulation | |||
474 | Encoding encoding = Encoding.UTF8; | 471 | Encoding encoding = Encoding.UTF8; |
475 | StreamReader reader = new StreamReader(inputStream, encoding); | 472 | StreamReader reader = new StreamReader(inputStream, encoding); |
476 | 473 | ||
477 | try | 474 | string requestBody = reader.ReadToEnd(); |
478 | { | 475 | keysvals.Add("body", requestBody); |
479 | string requestBody = reader.ReadToEnd(); | ||
480 | m_log.DebugFormat("[XXX] body {0}", requestBody); | ||
481 | keysvals.Add("body", requestBody); | ||
482 | } | ||
483 | catch (Exception e) | ||
484 | { | ||
485 | m_log.DebugFormat("[AGENT HANDLER]: Exception readin gzip stream: {0}", e); | ||
486 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; | ||
487 | return new byte[0]; | ||
488 | } | ||
489 | finally | ||
490 | { | ||
491 | reader.Close(); | ||
492 | } | ||
493 | 476 | ||
494 | httpResponse.StatusCode = 200; | 477 | httpResponse.StatusCode = 200; |
495 | httpResponse.ContentType = "text/html"; | 478 | httpResponse.ContentType = "text/html"; |