diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-06 13:22:22 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-06 13:22:22 -0700 |
| commit | a6b108641489caca1717b98cb888ef2de923f1fc (patch) | |
| tree | afbd1e6a8e5e64357ceb2193e505f6a217d758bd /indra/newview/llfloatervoiceeffect.cpp | |
| parent | ef735d839317c5d8837c3ce9afd66cb576a2ba94 (diff) | |
| parent | dc6c35e353b991db2651d26bc76e5b3ee9921157 (diff) | |
Merged from viewer-release after resolving conflicts
Diffstat (limited to 'indra/newview/llfloatervoiceeffect.cpp')
| -rw-r--r-- | indra/newview/llfloatervoiceeffect.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp index ca1f142760..61fe50e301 100644 --- a/indra/newview/llfloatervoiceeffect.cpp +++ b/indra/newview/llfloatervoiceeffect.cpp @@ -199,7 +199,12 @@ void LLFloaterVoiceEffect::refreshEffectList() if(sl_item) { LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD; - dynamic_cast<LLScrollListText*>(sl_item->getColumn(0))->setFontStyle(style); + LLScrollListText* slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0)); + llassert(slt); + if (slt) + { + slt->setFontStyle(style); + } } } } |