diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
commit | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch) | |
tree | a07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/newview/llnamebox.cpp | |
parent | c2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff) | |
parent | 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff) |
Another merge from http://hg.secondlife.com/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 + "]"; |