diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-21 11:35:37 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-21 11:35:37 +0000 |
| commit | e33ebe2b487c3d31933c3d37e0e8c40397d03f07 (patch) | |
| tree | c067f51ad1ca2195a4e4f9df59daf43a48bac7a8 | |
| parent | 695c758340954dabbf2c9e6f4a2e1ef9f6546a0b (diff) | |
EXT-3460: Update to URL hyperlinking with no protocol.
We no longer treat ":" or "/" as valid chars before a .com, .net,
.edu, or .org string when trying to match a URL with no protocol
(i.e., no http:// prefix).
| -rw-r--r-- | indra/llui/llurlentry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 7350457274..95dc2ce027 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -201,7 +201,7 @@ std::string LLUrlEntryHTTPLabel::getUrl(const std::string &string) // LLUrlEntryHTTPNoProtocol::LLUrlEntryHTTPNoProtocol() { - mPattern = boost::regex("(\\bwww\\.\\S+\\.\\S+|\\S+.com\\S*|\\S+.net\\S*|\\S+.edu\\S*|\\S+.org\\S*)", + mPattern = boost::regex("(\\bwww\\.\\S+\\.\\S+|\\b[^ \t\n\r\f\v:/]+.com\\S*|\\b[^ \t\n\r\f\v:/]+.net\\S*|\\b[^ \t\n\r\f\v:/]+.edu\\S*|\\b[^ \t\n\r\f\v:/]+.org\\S*)", boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_http.xml"; mTooltip = LLTrans::getString("TooltipHttpUrl"); |