diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-01-06 11:38:00 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-06 11:38:00 -0800 |
| commit | 2978609575eac6067b84fb4734228a81014ae26f (patch) | |
| tree | a0ad9d8758b727155d22ef448bfb9befe6187632 /indra/newview | |
| parent | 84ff7485ae161fe35963da2f35e111b685719ece (diff) | |
Fix for EXT-3730 (Current (temporary) Find URL returns an HTTP status code of 500 (Internal server error))
We now no longer check the error code returned from the MIME type probe.
If we have a mime type, use it, regardless of the status. If not, default to the web plugin and let it handle error reporting.
Diffstat (limited to 'indra/newview')
| -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()) |