diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-13 17:08:00 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-13 17:08:00 -0400 |
| commit | ded6a78541d9f779b5cbef0d1255588b93d5dce6 (patch) | |
| tree | f343cacbfd01888c604b891ceb877b429f50641c /indra/newview/llnamebox.cpp | |
| parent | fa20a3fe100bd2c99b6fe4c087c79268752a107c (diff) | |
| parent | c7c43d83f80dcac8be79cc76c9d9bbf8ff4c8354 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llnamebox.cpp')
| -rw-r--r-- | indra/newview/llnamebox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 74d4217899..c31da84f78 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 + "]"; |