diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
commit | 419bfb16fdd9b79d32736fd80652685a07f9e39f (patch) | |
tree | 4afafc0665ca3b486e2507369d9d214d40abf9ac /indra/newview/llfloatervoiceeffect.cpp | |
parent | ced040f8aef5a764c2e6fb261d5bbecd4df75064 (diff) | |
parent | 7de36b3d4217f5ceee8b46a59983229b7af35981 (diff) |
automated merge
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); + } } } } |