summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-11-13 13:47:18 -0800
committerMonroe Linden <monroe@lindenlab.com>2009-11-13 13:47:18 -0800
commitd191143cbc3aef7cd68cad98e480fb656c9e8c01 (patch)
treec950fb7c7abc9b8dee82d390da1d39d44052946b /indra/newview
parent39c53fcf0eb718b0a3d1f43a3c9ee1a38ffef49f (diff)
Special-case a "401" status ("auth required") in LLMimeDiscoveryResponder::error() to be treated as a mime type of "text/html" instead of a failure.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 513fae41eb..b4164a94e8 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -159,12 +159,21 @@ public:
virtual void error( U32 status, const std::string& reason )
{
- llwarns << "responder failed with status " << status << ", reason " << reason << llendl;
- if(mMediaImpl)
+ if(status == 401)
+ {
+ // This is the "you need to authenticate" status.
+ // Treat this like an html page.
+ completeAny(status, "text/html");
+ }
+ else
{
- mMediaImpl->mMediaSourceFailed = true;
+ llwarns << "responder failed with status " << status << ", reason " << reason << llendl;
+
+ if(mMediaImpl)
+ {
+ mMediaImpl->mMediaSourceFailed = true;
+ }
}
- // completeAny(status, "none/none");
}
void completeAny(U32 status, const std::string& mime_type)