diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 55a9cb7116..4285900149 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -371,6 +371,9 @@ LLUrlEntrySeconlifeURL::LLUrlEntrySeconlifeURL()
 	
 	mIcon = "Hand";
 	mMenuName = "menu_url_http.xml";
+
+	// <FS:Ansariel> We show the full URL in the text - show normal tool tip
+	mTooltip = LLTrans::getString("TooltipHttpUrl");
 }
 
 std::string LLUrlEntrySeconlifeURL::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
@@ -385,9 +388,23 @@ std::string LLUrlEntrySeconlifeURL::getLabel(const std::string &url, const LLUrl
 
 std::string LLUrlEntrySeconlifeURL::getTooltip(const std::string &url) const
 {
-	return url;
+	// <FS:Ansariel> We show the full URL in the text - show normal tool tip
+	//return url;
+	return 	mTooltip;
+	// </FS:Ansariel>
 }
 
+// <FS:Ansariel> BUG-8331: Clicking on trusted URLs open places panel
+std::string LLUrlEntrySeconlifeURL::getUrl(const std::string &string) const
+{
+	if (string.find("://") == std::string::npos)
+	{
+		return "http://" + escapeUrl(string);
+	}
+	return escapeUrl(string);
+}
+// </FS:Ansariel>
+
 //
 // 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 e0d06688d4..679c12b566 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -179,6 +179,8 @@ public:
 	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;
+	// <FS:Ansariel> BUG-8331: Clicking on trusted URLs open places panel
+	/*virtual*/ std::string getUrl(const std::string &string) const;
 
 private:
 	std::string mLabel;