Skip to content
Snippets Groups Projects
Commit 9862c58e authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

STORM-215 FIXED Disabled URL highlighting in name_box'es.

By the way, fixed invalid SLURLs that LLNameBox generated for groups.
parent 4b414302
No related branches found
No related tags found
No related merge requests found
...@@ -47,6 +47,7 @@ LLNameBox::LLNameBox(const Params& p) ...@@ -47,6 +47,7 @@ LLNameBox::LLNameBox(const Params& p)
{ {
mNameID = LLUUID::null; mNameID = LLUUID::null;
mLink = p.link; mLink = p.link;
mParseHTML = mLink; // STORM-215
mInitialValue = p.initial_value().asString(); mInitialValue = p.initial_value().asString();
LLNameBox::sInstances.insert(this); LLNameBox::sInstances.insert(this);
setText(LLStringUtil::null); setText(LLStringUtil::null);
...@@ -119,7 +120,7 @@ void LLNameBox::setName(const std::string& name, BOOL is_group) ...@@ -119,7 +120,7 @@ void LLNameBox::setName(const std::string& name, BOOL is_group)
std::string url; std::string url;
if (is_group) if (is_group)
url = "[secondlife:///app/group/" + LLURI::escape(name) + "/about " + name + "]"; url = "[secondlife:///app/group/" + mNameID.asString() + "/about " + name + "]";
else else
url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]"; url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment