From 99bf150059fea3f0856e376fba66e5f9d6a4abe7 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 16 Oct 2014 10:41:03 +0300
Subject: [PATCH] MAINT-4582 FIXED Certain URLs which end contain
secondlife.com or lindenlab.com incorrectly open the Place Profile floater
---
indra/llui/llurlentry.cpp | 9 +++++++++
indra/llui/llurlentry.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index c06d6144b92..cc7956078d8 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
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 1cb11cdb1ce..055a8b15151 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -179,6 +179,7 @@ class LLUrlEntrySeconlifeURL : public LLUrlEntryBase
bool isTrusted() const { return true; }
/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
/*virtual*/ std::string getTooltip(const std::string &url) const;
+ /*virtual*/ std::string getUrl(const std::string &string) const;
private:
std::string mLabel;
--
GitLab