diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 11:04:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 11:04:32 -0800 |
| commit | 6d5aff5aecc5c537ea6d24a2f79afa1afa5f47a8 (patch) | |
| tree | 465303a4efda24a5515ce581f3af91d77a801d28 /indra/newview/llviewermedia.cpp | |
| parent | f9081220accfe5c197f1c567af8806bde236f946 (diff) | |
| parent | b8a046f7d9a59c58b98fa981ae2e27e69f8c28b5 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
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; |