diff options
author | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
commit | f7d94905db3f39785863b91f75daf612dc6c3c48 (patch) | |
tree | ca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/newview/llviewermedia.cpp | |
parent | fa1913ea679fd895d709da5c5782b26c7d03a40a (diff) | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) |
merge changes for 3.8.0-release
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) || |