diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-04-22 18:52:22 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-04-22 18:52:22 -0700 |
commit | 368173b7d602aa1d790a4510c4bf9e6d9e102d1d (patch) | |
tree | 53f047c085bbaaf65bc49d897e71c59a024a0cc4 /indra | |
parent | 1def810c260b17553a922cbc256d748d74db6aa1 (diff) |
EXP-749 [REGRESSION] Voice status indicator shown in IM session instead of profile pic in Basic and Advanced modes
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llchiclet.cpp | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 885d553524..277fc9d7b9 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) diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 99807d4717..d27c14f4e7 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -21,6 +21,7 @@ width="20" /> <chiclet_im_p2p.avatar_icon bottom="3" + color="white" follows="left|top|bottom" height="20" left="2" |