diff options
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 15 | 
1 files changed, 9 insertions, 6 deletions
| diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 6e11788e0a..7e8c8eb92e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -170,12 +170,15 @@ public:  		//     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 == 302) || -			(status == 499)  -			) +//		if(	((status >= 200) && (status < 300))	|| +//			((status >= 400) && (status < 499))	||  +//			(status == 500) || +//			(status == 302) || +//			(status == 499)  +//			) +		// We now no longer check the error code returned from the probe. +		// If we have a mime type, use it.  If not, default to the web plugin and let it handle error reporting. +		if(1)  		{  			// The probe was successful.  			if(mime_type.empty()) | 
