diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 13:50:43 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 13:50:43 +0200 |
commit | 026a35798f22c9d0ccefecef393047a0f4e7c0c9 (patch) | |
tree | f0bb31faa0a572dc0adce14c6554eeb1217a0080 /indra/newview/llimpanel.cpp | |
parent | 0c7a4b6a7d2675a916efacfb9f2f1a6098c027dd (diff) | |
parent | 9e11895c258d4dc7bc141804d8b7aa2762de4013 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimpanel.cpp')
-rw-r--r-- | indra/newview/llimpanel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 0b8b5935f8..3178658faa 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -849,7 +849,8 @@ void LLFloaterIMPanel::processSessionUpdate(const LLSD& session_update) //update the speakers dropdown too - mSpeakerPanel->setVoiceModerationCtrlMode(voice_moderated); + if (mSpeakerPanel) + mSpeakerPanel->setVoiceModerationCtrlMode(voice_moderated); } } |