diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-03 16:21:48 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-03 16:21:48 +0200 |
| commit | f888a3fd00ca32275ab2da6437cb011b3ab78f89 (patch) | |
| tree | 0df7bc9ed5a133634d0d414a97f87cd99956d5b2 /indra | |
| parent | 168c1d5a85e8f4f4975ee4501e3dbb8f10d85334 (diff) | |
CHUI-556 (Tooltip on call button incorrect when call is active)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index d43381041b..08c2b951df 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -691,8 +691,13 @@ void LLFloaterIMSessionTab::processChatHistoryStyleUpdate() void LLFloaterIMSessionTab::updateCallBtnState(bool callIsActive) { - getChild<LLButton>("voice_call_btn")->setImageOverlay( + LLButton* voiceButton = getChild<LLButton>("voice_call_btn"); + voiceButton->setImageOverlay( callIsActive? getString("call_btn_stop") : getString("call_btn_start")); + + voiceButton->setToolTip( + callIsActive? getString("end_call_button_tooltip") : getString("start_call_button_tooltip")); + enableDisableCallBtn(); } diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 1d74f1bc25..faf54774f6 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -43,6 +43,12 @@ <floater.string name="tooltip_to_main_window" value="Move this conversation back to main window"/> + <floater.string + name="start_call_button_tooltip" + value="Open voice connection"/> + <floater.string + name="end_call_button_tooltip" + value="Close voice connection"/> <view follows="all" layout="topleft" |