summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorcallum <none@none>2009-11-23 17:35:47 -0800
committercallum <none@none>2009-11-23 17:35:47 -0800
commitfdf80d2af35c5e2ce06f86f8710b470abf7ab387 (patch)
tree368804880923b667f392153db4be1c470c6329c9 /indra/newview
parent1b07c1d7fb5b6d3ce15083bc3dbb65a3f0ac8006 (diff)
Fix for DEV-42997 404s result in blank page
Also needs a tweak to LLQtWebKit that stops navigation to 404 URL specified in code if the URL is empty.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 8c41133a3a..9dfdf3d5b1 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -169,6 +169,12 @@ public:
completeAny(status, "text/html");
}
else
+ if(status == 404)
+ {
+ // Treat 404s like an html page.
+ completeAny(status, "text/html");
+ }
+ else
{
llwarns << "responder failed with status " << status << ", reason " << reason << llendl;