summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-04 16:25:05 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-04 16:25:05 -0800
commitf446ae476752d2690422e60dc5419e59e3fd6b10 (patch)
tree6bdbd547b24e0746cd6ffa3f73d64f83df41ac6e
parente8659e0e13c65308ad2f036dc7e7ccff0e665976 (diff)
DEV-44732 - a better fix.
-rw-r--r--indra/llui/llurlentry.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 99eb992ddd..f7528bc62a 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -202,8 +202,9 @@ std::string LLUrlEntryHTTPLabel::getUrl(const std::string &string)
LLUrlEntryHTTPNoProtocol::LLUrlEntryHTTPNoProtocol()
{
mPattern = boost::regex("("
- "\\bwww\\.\\S+\\.\\S+" // www.FOO.BAR
- "|\\b[^ \t\n\r\f\v:/]+.(?:com|net|edu|org)[^[:space:][:alnum:]]*$" // FOO.net
+ "\\bwww\\.\\S+\\.\\S+" // i.e. www.FOO.BAR
+ "|" // or
+ "\\b[^ \\t\\n\\r\\f\\v:/]+\\.(?:com|net|edu|org)[^[:space:][:alnum:]]*\\>" // i.e. FOO.net
")",
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_http.xml";