diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/llstylemap.cpp | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to 'linden/indra/newview/llstylemap.cpp')
| -rw-r--r-- | linden/indra/newview/llstylemap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llstylemap.cpp b/linden/indra/newview/llstylemap.cpp index a34b4b8..890bbf1 100644 --- a/linden/indra/newview/llstylemap.cpp +++ b/linden/indra/newview/llstylemap.cpp | |||
| @@ -97,7 +97,7 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link) | |||
| 97 | style->setColor(LLColor4::white); | 97 | style->setColor(LLColor4::white); |
| 98 | (*this)[id] = style; | 98 | (*this)[id] = style; |
| 99 | } | 99 | } |
| 100 | else | 100 | else |
| 101 | { | 101 | { |
| 102 | LLStyleSP style = (*iter).second; | 102 | LLStyleSP style = (*iter).second; |
| 103 | if ( style->getLinkHREF() != link ) | 103 | if ( style->getLinkHREF() != link ) |