From 9862c58e1b3eec24e412ee7c2980d2945c38360e Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Thu, 30 Sep 2010 23:35:48 +0300
Subject: [PATCH] STORM-215 FIXED Disabled URL highlighting in name_box'es.
By the way, fixed invalid SLURLs that LLNameBox generated for groups.
---
indra/newview/llnamebox.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index 74d4217899d..c31da84f78c 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -47,6 +47,7 @@ LLNameBox::LLNameBox(const Params& p)
{
mNameID = LLUUID::null;
mLink = p.link;
+ mParseHTML = mLink; // STORM-215
mInitialValue = p.initial_value().asString();
LLNameBox::sInstances.insert(this);
setText(LLStringUtil::null);
@@ -119,7 +120,7 @@ void LLNameBox::setName(const std::string& name, BOOL is_group)
std::string url;
if (is_group)
- url = "[secondlife:///app/group/" + LLURI::escape(name) + "/about " + name + "]";
+ url = "[secondlife:///app/group/" + mNameID.asString() + "/about " + name + "]";
else
url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]";
--
GitLab