From 55f4ad3dc8a218d00dc6f34241b27be2fac5a23b Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 1 Dec 2009 11:47:38 -0800
Subject: [PATCH] Fix for "DEV-43581 - EXT-2901: [BSI] Can't access twitter
pages directly via MoaP"
---
indra/newview/llviewermedia.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index f2ddb0b1f1b..608c5c20978 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -171,7 +171,16 @@ LOG_CLASS(LLMimeDiscoveryResponder);
else
if(status == 404)
{
- // Treat 404s like an html page.
+ // 404 is content not found - sites often have bespoke 404 pages so
+ // treat them like an html page.
+ completeAny(status, "text/html");
+ }
+ else
+ if(status == 406)
+ {
+ // 406 means the server sent something that we didn't indicate was acceptable
+ // Eventually we should send what we accept in the headers but for now,
+ // treat 406s like an html page.
completeAny(status, "text/html");
}
else
--
GitLab