summaryrefslogtreecommitdiff
path: root/indra/newview/llstylemap.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-10-05 13:39:53 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2009-10-05 13:39:53 -0700
commit81a63ac0886a31a566535a3483e5013f5bc0b424 (patch)
tree1bb0319755a5e26e0bc7f9f20632ae8f31538971 /indra/newview/llstylemap.cpp
parent0f5bbec3747f3ff2b1d580506d35dc080fcd1a98 (diff)
parent9818f158366a0df980a2e4b9251177d9a9209cfb (diff)
merge with latest from lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/llstylemap.cpp')
-rw-r--r--indra/newview/llstylemap.cpp7
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];
}