diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:02:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:02:21 +0100 |
| commit | c890ca021a49e52095e9a8de7db528e48c3da205 (patch) | |
| tree | 1e5227e803980b3df83a77e0d0c39623e0fa2069 /indra/newview/llstylemap.cpp | |
| parent | 60b12a24d4a6061a3fe22a433cb8852002a8e857 (diff) | |
| parent | 20bdbd487e9c64ce553ad68d467b1100342fe6a1 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llstylemap.cpp')
| -rw-r--r-- | indra/newview/llstylemap.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp index 8fab3bb361..b3d7dddde8 100644 --- a/indra/newview/llstylemap.cpp +++ b/indra/newview/llstylemap.cpp @@ -46,20 +46,12 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source) if (mMap.find(source) == mMap.end()) { LLStyle::Params style_params; - if (source != LLUUID::null && source != gAgent.getID() ) + if (source != LLUUID::null) { style_params.color.control = "HTMLLinkColor"; style_params.readonly_color.control = "HTMLLinkColor"; - style_params.link_href = - LLSLURL("agent", source, "inspect").getSLURLString(); + style_params.link_href = LLSLURL("agent", source, "inspect").getSLURLString(); } - else - { - // Make the resident's own name white and don't make the name clickable. - style_params.color = LLColor4::white; - style_params.readonly_color = LLColor4::white; - } - mMap[source] = style_params; } return mMap[source]; |