diff options
| author | Callum Prentice <callum@lindenlab.com> | 2009-12-29 12:30:33 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2009-12-29 12:30:33 -0800 |
| commit | 9f5187d338c0fd293526a91cafd9c10c9aefc1f3 (patch) | |
| tree | f0e730cb956e17cf336da0ec6e73016f5067b98f /indra/newview | |
| parent | 3320634c93e73eed05cdbd35498209ab87e5bb09 (diff) | |
Fix for EXT-3758 (DEV-44584) - media will not display join.secondlife.com
Reviewed by CB
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 4d912c6c11..bf96472e7e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -168,12 +168,16 @@ public: // 499 is the error code for host not found, timeout, etc. // 500 means "Internal Server error" but we decided it's okay to // accept this and go past it in the MIME type probe + // 302 means the resource can be found temporarily in a different place - added this for join.secondlife.com + // 499 is a code specifc to join.secondlife.com (????) apparently safe to ignore if( ((status >= 200) && (status < 300)) || ((status >= 400) && (status < 499)) || - (status == 500) ) + (status == 500) || + (status == 302) || + (status == 499) + ) { // The probe was successful. - if(mime_type.empty()) { // Some sites don't return any content-type header at all. |