diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 18:03:36 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 18:03:36 +0000 |
| commit | c0ff08e0b4af5ce58a47321f39c69c1d24600d1e (patch) | |
| tree | 7626bfcb4589b7a2e27c3b9ea7d8a219aad49929 /indra/newview/llimpanel.cpp | |
| parent | 74cb5c82a4e5eeb1ef722f73c96f64c4750db2be (diff) | |
| parent | 700085a093c71023703b43ca19e7ba114f2183ff (diff) | |
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 0b8b5935f8..87b801d73b 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -848,8 +848,11 @@ void LLFloaterIMPanel::processSessionUpdate(const LLSD& session_update) } - //update the speakers dropdown too - mSpeakerPanel->setVoiceModerationCtrlMode(voice_moderated); + //update the speakers dropdown too, if it's available + if (mSpeakerPanel) + { + mSpeakerPanel->setVoiceModerationCtrlMode(voice_moderated); + } } } |