diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
| commit | 66bf21c32d64422f9fdc56161acc83b53923735b (patch) | |
| tree | bdd1e565308fb97d7b8b2c97f9cd16489a1b285d /indra/newview/llviewermedia.cpp | |
| parent | dc5960d3930efa482b7de205fc9b8d08785da4c8 (diff) | |
| parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rwxr-xr-x | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 509227c683..3eae0f8d86 100755 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -196,7 +196,7 @@ private: // 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 + // 499 is a code specifc to join.secondlife.com apparently safe to ignore // if( ((status >= 200) && (status < 300)) || // ((status >= 400) && (status < 499)) || // (status == 500) || |