diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-27 18:11:47 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-27 18:11:47 +0200 |
| commit | 7563bb647048725e144fea34ea3cba426eed0ad1 (patch) | |
| tree | 55ca85ba1e195c74686162d2ece01b53e29f1610 /indra/llui/llurlentry.cpp | |
| parent | dd7dc1b4cae00ecd78e8ecfd5bb25aa861503596 (diff) | |
| parent | 2188da26bea8eff0538498c4e6caa69be53d6bbc (diff) | |
Merged lindenlab/viewer-lion into default
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"; |