summaryrefslogtreecommitdiff
path: root/indra/newview/llnamebox.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-12 15:52:03 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-12 15:52:03 -0700
commitd3422c8d9e90f8c5ea675b470f425b13ed602654 (patch)
tree6c154dfca958e33c327834427fe8afaba6270af0 /indra/newview/llnamebox.cpp
parent0f7ca61386e4cf0f9efda7c380c40cc608f26ea3 (diff)
parenta8fbfa40ba6153668e1f713ae0e128224b4f400f (diff)
Merge
Diffstat (limited to 'indra/newview/llnamebox.cpp')
-rw-r--r--indra/newview/llnamebox.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index 85cde5f94c..1099316a19 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);
@@ -108,7 +109,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 + "]";