diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/newview/llstylemap.cpp | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/llstylemap.cpp')
| -rw-r--r-- | indra/newview/llstylemap.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp index fc125dcf9c..2485563cbc 100644 --- a/indra/newview/llstylemap.cpp +++ b/indra/newview/llstylemap.cpp @@ -33,8 +33,10 @@ #include "llviewerprecompiledheaders.h" #include "llstylemap.h" + #include "llstring.h" #include "llui.h" +#include "llslurl.h" #include "llviewercontrol.h" #include "llagent.h" @@ -47,7 +49,8 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source) if (source != LLUUID::null && source != gAgent.getID() ) { style_params.color.control = "HTMLLinkColor"; - style_params.link_href = llformat("secondlife:///app/agent/%s/about",source.asString().c_str()); + style_params.link_href = + LLSLURL::buildCommand("agent", source, "inspect"); } else { @@ -55,7 +58,7 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source) style_params.color = LLColor4::white; } - mMap[source] = LLStyle::Params(); + mMap[source] = style_params; } return mMap[source]; } |