summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-28 13:25:48 -0800
committercallum <none@none>2009-12-28 13:25:48 -0800
commitdd1fb1568e85a8e3622372cae21bcd3205051718 (patch)
tree821bab690fbb6f1c93a51c264df68c3b38d202fe /indra/newview
parent005688984d3d01609a6649799d82e22339ef91b5 (diff)
Fix for EXT-3730 (HTTP response code of 500 from Find floater URL breaks it)
Reviewed by Sam
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermedia.cpp5
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.