diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-23 07:52:43 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-10-23 07:52:43 +0300 |
| commit | 52d30bbbe94b93da6d56633bff0f6d40fa135ded (patch) | |
| tree | 98e8dc47b2a2c94157f3d4e10a5c3d48697594c9 /indra/llui/llurlentry.cpp | |
| parent | 966e9efd569b70c13755d8fe163c9a929a9394cb (diff) | |
MAINT-5464 FIXED Do not add badge to links that have a port number specified.
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"; |