diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-06 15:28:31 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-06 15:28:31 +0300 |
| commit | 6eef4d70d7b53216bc2e7e463bf9108447de9d55 (patch) | |
| tree | c692881e840069b3932579ca91448f79b54d5b43 /indra/newview/llpanelvoiceeffect.cpp | |
| parent | f92e50c54246add3afc752f86f072b23bdb2e5ad (diff) | |
| parent | a1bbba2be64daf332bdf511129b1ec4f2bea1540 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelvoiceeffect.cpp')
| -rw-r--r-- | indra/newview/llpanelvoiceeffect.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp index fd470798ee..68fa9d1e5e 100644 --- a/indra/newview/llpanelvoiceeffect.cpp +++ b/indra/newview/llpanelvoiceeffect.cpp @@ -129,6 +129,8 @@ void LLPanelVoiceEffect::update(bool list_updated) if (mVoiceEffectCombo) { LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface(); + llassert(effect_interface); + if (!effect_interface) return; if (list_updated) { // Add the default "No Voice Morph" entry. |