diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
| commit | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (patch) | |
| tree | 20476d64aecbb1b644ea1f307264c222b7d2e6f6 /indra/llui/llurlentry.cpp | |
| parent | c2ca71322bf48653d466cba40bbe01c3401318c7 (diff) | |
| parent | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff) | |
Automated merge
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -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 466ac2a7d1..366f59d677 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -207,7 +207,7 @@ LLUrlEntryHTTPNoProtocol::LLUrlEntryHTTPNoProtocol() mPattern = boost::regex("(" "\\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 + "(?<!@)\\b[^[:space:]:@/]+\\.(?:com|net|edu|org)([/:]\\S*)?\\b" // i.e. FOO.net ")", boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_http.xml"; |