diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 13:04:29 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 13:04:29 +0200 |
| commit | a69a85544f628b7cd5a19f54a059eb02324419e4 (patch) | |
| tree | b496d70a74983a14dc2a1189acf21c4cacdcf625 /indra/newview/llchiclet.cpp | |
| parent | b79b8f87a37888decd3f82e9e255cce641a3955f (diff) | |
| parent | 553cf40d136e70f4819cb2b72d0483287db81b17 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index f646bcccb5..18bd7b725f 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -545,6 +545,7 @@ void LLIMChiclet::toggleSpeakerControl() } setRequiredWidth(); + mSpeakerCtrl->setSpeakerId(LLUUID::null); mSpeakerCtrl->setVisible(getShowSpeaker()); } @@ -954,7 +955,10 @@ LLIMGroupChiclet::~LLIMGroupChiclet() void LLIMGroupChiclet::draw() { - switchToCurrentSpeaker(); + if(getShowSpeaker()) + { + switchToCurrentSpeaker(); + } LLIMChiclet::draw(); } |