diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
commit | 66500c7ad5d799eb56f8f56924a00744f4a90e3d (patch) | |
tree | fcd42e2c1853cdd897128d79b5b18eebbe32a32a /indra/newview/llstylemap.cpp | |
parent | 225dd434cfeb6a67c5878b41538dafe2a7f4a284 (diff) | |
parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) |
merge
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 6ef42e37f8..43fe37ac77 100644 --- a/indra/newview/llstylemap.cpp +++ b/indra/newview/llstylemap.cpp @@ -40,20 +40,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]; |