diff options
Diffstat (limited to 'linden/indra/newview/llstylemap.cpp')
-rw-r--r-- | linden/indra/newview/llstylemap.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/linden/indra/newview/llstylemap.cpp b/linden/indra/newview/llstylemap.cpp index a8c8bf7..365de2f 100644 --- a/linden/indra/newview/llstylemap.cpp +++ b/linden/indra/newview/llstylemap.cpp | |||
@@ -60,11 +60,11 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source) | |||
60 | { | 60 | { |
61 | LLStyleSP style(new LLStyle); | 61 | LLStyleSP style(new LLStyle); |
62 | style->setVisible(true); | 62 | style->setVisible(true); |
63 | style->setFontName(LLString::null); | 63 | style->setFontName(LLStringUtil::null); |
64 | if (source != gAgent.getID() && source != LLUUID::null) | 64 | if (source != LLUUID::null) |
65 | { | 65 | { |
66 | style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); | 66 | style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); |
67 | LLString link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str()); | 67 | std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str()); |
68 | style->setLinkHREF(link); | 68 | style->setLinkHREF(link); |
69 | } | 69 | } |
70 | else | 70 | else |
@@ -73,3 +73,13 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source) | |||
73 | } | 73 | } |
74 | return (*this)[source]; | 74 | return (*this)[source]; |
75 | } | 75 | } |
76 | |||
77 | void LLStyleMap::update() | ||
78 | { | ||
79 | for (style_map_t::iterator iter = begin(); iter != end(); ++iter) | ||
80 | { | ||
81 | LLStyleSP &style = iter->second; | ||
82 | // Update the link color in case it has been changed. | ||
83 | style->setColor(gSavedSettings.getColor4("HTMLLinkColor")); | ||
84 | } | ||
85 | } | ||