diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-03-17 13:14:21 -0700 |
| commit | b8c1976460374e743743728ef49b38ad52c453a4 (patch) | |
| tree | 4f340d954ae3552d4dbb87b389d15d98d66eba51 /indra/llui/llurlentry.cpp | |
| parent | 7a0fb4fece5a92627caa08622e9584a903a3fa1d (diff) | |
| parent | 4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rwxr-xr-x | 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 b459d75dde..e4848362a7 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -229,7 +229,7 @@ static std::string getStringAfterToken(const std::string str, const std::string LLUrlEntryHTTP::LLUrlEntryHTTP() : LLUrlEntryBase() { - mPattern = boost::regex("https?://([-\\w\\.]+)+(:\\d+)?(:\\w+)?(@\\d+)?(@\\w+)?\\.[a-z](:\\d+)?(:\\w+)?(@\\d+)?(@\\w+)?/?\\S*", + mPattern = boost::regex("https?://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?", boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_http.xml"; mTooltip = LLTrans::getString("TooltipHttpUrl"); |