diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
| commit | 353d2059fc33174010127863a25983b918115361 (patch) | |
| tree | f2e08370b140352957b4d7757e59e0fe673f5a14 /indra/newview/llchiclet.cpp | |
| parent | 7610c0c050a84ebdf08b8e206eb7fe5e190dedb2 (diff) | |
| parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 885d553524..3000209aad 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -483,8 +483,9 @@ void LLIMChiclet::setShowSpeaker(bool show) if(needs_resize) { mShowSpeaker = show; - toggleSpeakerControl(); } + + toggleSpeakerControl(); } void LLIMChiclet::enableCounterControl(bool enable) @@ -1183,6 +1184,10 @@ void LLChicletPanel::onCurrentVoiceChannelChanged(const LLUUID& session_id) if(chiclet) { chiclet->setShowSpeaker(true); + if (gSavedSettings.getBOOL("OpenIMOnVoice")) + { + LLIMFloater::show(chiclet->getSessionId()); + } } } |