summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-07-02 09:40:49 -0700
committercallum_linden <none@none>2015-07-02 09:40:49 -0700
commit71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch)
tree9eab3e24208d2aecedf29eed0eebb6f209197475 /indra/newview/llviewermedia.cpp
parentd89b4109f9ac3f1ef95480823df292bbc8200347 (diff)
parent8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff)
Merge with head
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rwxr-xr-xindra/newview/llviewermedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 3bdb558232..aa4943b8e8 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) ||