diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-04 16:53:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-04 16:53:39 -0400 |
| commit | 9bb2a80be48b94725ae951488002ba5f96aeec63 (patch) | |
| tree | a7c0a7215de9bb3179c32f22b03f41ad940d7cf4 /indra | |
| parent | 9ccb83520758ff8967ad7e32594074266504d4c2 (diff) | |
| parent | 9d23a40c85dbaa800bafd8c468532301265ed6f3 (diff) | |
automated merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/llhttpclient.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterurlentry.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index dd56e18caf..964cbd1026 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -79,8 +79,10 @@ namespace { if (mResponder.get()) { - mResponder->completedRaw(mStatus, mReason, channels, buffer); + // Allow clients to parse headers before we attempt to parse + // the body and provide completed/result/error calls. mResponder->completedHeader(mStatus, mReason, mHeaderOutput); + mResponder->completedRaw(mStatus, mReason, channels, buffer); } } virtual void header(const std::string& header, const std::string& value) diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index 002d417e4c..0e802e9736 100644 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -70,11 +70,6 @@ public: completeAny(status, mime_type); } - virtual void error( U32 status, const std::string& reason ) - { - completeAny(status, LLMIMETypes::getDefaultMimeType()); - } - void completeAny(U32 status, const std::string& mime_type) { // Set empty type to none/none. Empty string is reserved for legacy parcels |