diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-26 18:07:34 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-26 18:07:34 +0200 |
| commit | cf53c157fe46eb02568101a51c43a41ee2a4cd18 (patch) | |
| tree | 5d3b9af45f887cf60156832906a23aa589991484 /indra/llui/llurlentry.cpp | |
| parent | b0b8d34b15350f44d76f253e6b69f1c4e8ad7f33 (diff) | |
| parent | 7ea4303aa25960a3aa0971999725a0ca1bcfdec4 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 7f6cc22e90..576fff5fb2 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -449,7 +449,10 @@ std::string LLUrlEntrySLURL::getLocation(const std::string &url) const // LLUrlEntrySecondlifeURL::LLUrlEntrySecondlifeURL() { - mPattern = boost::regex("https?://([-\\w\\.]*\\.)?(secondlife|lindenlab)\\.com(:\\d{1,5})?\\/\\S*", + mPattern = boost::regex("((http://([-\\w\\.]*\\.)?(secondlife|lindenlab)\\.com)" + "|" + "(https://([-\\w\\.]*\\.)?(secondlife|lindenlab)\\.com(:\\d{1,5})?))" + "\\/\\S*", boost::regex::perl|boost::regex::icase); mIcon = "Hand"; |