summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoiceeffect.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-06 15:28:31 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-06 15:28:31 +0300
commit6eef4d70d7b53216bc2e7e463bf9108447de9d55 (patch)
treec692881e840069b3932579ca91448f79b54d5b43 /indra/newview/llfloatervoiceeffect.cpp
parentf92e50c54246add3afc752f86f072b23bdb2e5ad (diff)
parenta1bbba2be64daf332bdf511129b1ec4f2bea1540 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloatervoiceeffect.cpp')
-rw-r--r--indra/newview/llfloatervoiceeffect.cpp7
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);
+ }
}
}
}