diff options
| author | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
| commit | 4acf56d2a79a4f3bb555977aeaef21e15e26f684 (patch) | |
| tree | ac0d8ff2225916323d9b942246edd458e04fd738 /indra/llui/llurlentry.cpp | |
| parent | 3f83c05f7c71887825c907b0e148d81cd7de5324 (diff) | |
| parent | c9cf84913d306103da51dc83e5932ff3fb308d32 (diff) | |
Merge in viewer-2-0 changes
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 1b6dd1b264..4927e57a52 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -204,7 +204,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"; |