summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-11-13 14:00:03 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-11-13 14:00:03 +0200
commit937c8c8595972947e901a580b656c45d0e5b27a0 (patch)
tree317e1062385e07cd9a11bf18ed51ed0c620b43cf /indra/newview/llimpanel.cpp
parent1db5d35447478a74ece447297289d76bfef8c48c (diff)
parent9e11895c258d4dc7bc141804d8b7aa2762de4013 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimpanel.cpp')
-rw-r--r--indra/newview/llimpanel.cpp3
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);
}
}