summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-25 09:54:19 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-25 09:54:19 -0800
commit05ae52a37f9f4d2519c40fe38f1b7143270c46ee (patch)
treeba3ea89cda34343550a909700f53ab18043a5d4a /indra/newview/llviewermedia.cpp
parente2e7d544b6a114e70e3b46f516a4f0e8d7db4bd1 (diff)
parent46b36d4fde4de97cd9960553ea77a64fbbe34b6a (diff)
merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-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;