diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-25 12:01:05 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-25 12:01:05 -0500 |
| commit | 57bc7dc44f31ef132a4abec228459c490c425eed (patch) | |
| tree | 70178face4242ee8801c5e759c608bf1c9695eff /indra/newview/llviewermedia.cpp | |
| parent | 33450e6f1fc95e3552d2115bf7e4fcf05f3d7916 (diff) | |
| parent | 725cdc6e5b85da369386d586c50ceb453c5979b4 (diff) | |
automated merge from viewer-2-0 pull -u
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; |