diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 17:58:40 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 17:58:40 +0000 |
commit | e5a2b1c458a86006959b924986288c48689a9bd3 (patch) | |
tree | 1a9b8fc244234b76ef5f37c14133e5f716c1c53c /indra/newview/llurldispatcher.cpp | |
parent | 74cb5c82a4e5eeb1ef722f73c96f64c4750db2be (diff) | |
parent | a5f6da09757c371e08b4c184d18fd50388c0afe9 (diff) |
merge.
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
-rw-r--r-- | indra/newview/llurldispatcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index a3daca6fa4..9e064d8135 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -364,9 +364,9 @@ bool LLURLDispatcher::dispatchRightClick(const std::string& url) bool LLURLDispatcher::dispatchFromTextEditor(const std::string& url) { // *NOTE: Text editors are considered sources of trusted URLs - // in order to make objectim and avatar profile links in chat - // history work. While a malicious resident could chat an app - // SLURL, the receiving resident will see it and must affirmatively + // in order to make avatar profile links in chat history work. + // While a malicious resident could chat an app SLURL, the + // receiving resident will see it and must affirmatively // click on it. // *TODO: Make this trust model more refined. JC const bool trusted_browser = true; |