diff options
| author | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
| commit | 01561ea13ab5741aee70b8873d81078bafb55b86 (patch) | |
| tree | 2c1267e05ccab296525ad1dea469a60560c37a30 /indra/newview/llstylemap.cpp | |
| parent | e747e9a3da3166de88dea1af213a36694135b820 (diff) | |
| parent | 69bed1f123f35b6124f4e3255df156b7fe82418b (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/llstylemap.cpp')
| -rw-r--r-- | indra/newview/llstylemap.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp index 2485563cbc..61705c4eb3 100644 --- a/indra/newview/llstylemap.cpp +++ b/indra/newview/llstylemap.cpp @@ -49,6 +49,7 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source) if (source != LLUUID::null && source != gAgent.getID() ) { style_params.color.control = "HTMLLinkColor"; + style_params.readonly_color.control = "HTMLLinkColor"; style_params.link_href = LLSLURL::buildCommand("agent", source, "inspect"); } @@ -56,6 +57,7 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source) { // 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; @@ -75,11 +77,13 @@ const LLStyle::Params &LLStyleMap::lookup(const LLUUID& id, const std::string& l if (id != LLUUID::null && !link.empty()) { style_params.color.control = "HTMLLinkColor"; + style_params.readonly_color.control = "HTMLLinkColor"; style_params.link_href = link; } else { style_params.color = LLColor4::white; + style_params.readonly_color = LLColor4::white; } mMap[id] = style_params; } |