diff options
author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-16 10:41:03 +0300 |
---|---|---|
committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-16 10:41:03 +0300 |
commit | 99bf150059fea3f0856e376fba66e5f9d6a4abe7 (patch) | |
tree | 922a62c89d4a63b77931a8ad6d2f20599f011208 /indra/llui/llurlentry.cpp | |
parent | 73c1e41ae57ff80ff143d4784e7b1dc5e7b5c37f (diff) |
MAINT-4582 FIXED Certain URLs which end contain secondlife.com or lindenlab.com incorrectly open the Place Profile floater
Diffstat (limited to 'indra/llui/llurlentry.cpp')
-rwxr-xr-x | indra/llui/llurlentry.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index c06d6144b9..cc7956078d 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -368,6 +368,15 @@ std::string LLUrlEntrySeconlifeURL::getTooltip(const std::string &url) const return url; } +std::string LLUrlEntrySeconlifeURL::getUrl(const std::string &string) const +{ + if (string.find("://") == std::string::npos) + { + return "http://" + escapeUrl(string); + } + return escapeUrl(string); +} + // // LLUrlEntryAgent Describes a Second Life agent Url, e.g., // secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about |