diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 20:06:30 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 20:06:30 -0600 |
| commit | 22958ae80351f33287c978b9896258d460f722dc (patch) | |
| tree | dbb5b1bc3070cafc92d46c808b224bade01575f3 /indra/newview/llnamebox.cpp | |
| parent | 03277635d03e8e7c2f73285743fdd9c77802d76f (diff) | |
| parent | 7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (diff) | |
Merge
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 + "]"; |