diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-29 12:21:00 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-29 12:21:00 +0200 |
| commit | 2fdec10a3bd1c4d84ad1f4f291c9b08a27fceb2d (patch) | |
| tree | c7b937fdee27a68cc6e12ef43cbcf73a1624f77c /indra/newview | |
| parent | d89793616e32cace99b5b76e47d51d141b20c7f2 (diff) | |
| parent | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index df62c9628d..4d912c6c11 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -166,8 +166,11 @@ public: // 2xx status codes indicate success. // Most 4xx status codes are successful enough for our purposes. // 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 if( ((status >= 200) && (status < 300)) || - ((status >= 400) && (status < 499)) ) + ((status >= 400) && (status < 499)) || + (status == 500) ) { // The probe was successful. |