diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
| commit | 7ce37f9910016f7225621df9e70dd2fd7c41725d (patch) | |
| tree | db09b96def05e74d4b93de43d442618a70a52ef1 /indra/llui/llurlentry.cpp | |
| parent | cbdf791fb1634c3c42c1e24da4b99dfdc3251f26 (diff) | |
| parent | 5099d01b74cfdd4ba192844b9fb7c5d19c454a54 (diff) | |
Merged lindenlab/viewer-lion into default
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 576fff5fb2..57de35dfde 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"); |