From fdf80d2af35c5e2ce06f86f8710b470abf7ab387 Mon Sep 17 00:00:00 2001 From: callum Date: Mon, 23 Nov 2009 17:35:47 -0800 Subject: 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. --- indra/newview/llviewermedia.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') 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; -- cgit v1.2.3