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 | a1c46ac2921d8e6aee018002eee280d9c6bb4cee (patch) | |
| tree | afbd1e6a8e5e64357ceb2193e505f6a217d758bd /indra/newview/llpanelvoiceeffect.cpp | |
| parent | 3de5be44adb91d3a7e1ff3ca8b415964a722ce49 (diff) | |
| parent | dc6c35e353b991db2651d26bc76e5b3ee9921157 (diff) | |
Merged from viewer-release after resolving conflicts
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. |