diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
| commit | 90f9f5dbad8a0e6dc20b3f7fc58527e572a6b3f7 (patch) | |
| tree | 2b6d67485b851d3c9a7adcad4709fed64b11c428 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | b43c8afc36a11c34fa76443be85430cac6c72c42 (diff) | |
| parent | 3f6f374c2566c85e1a9480da674bfc2172dd9162 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index d43381041b..d04fa2674d 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -306,7 +306,7 @@ void LLFloaterIMSessionTab::onFocusReceived() LLFloaterIMContainer* container = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); if (container) { - container->selectConversationPair(mSessionID, true); + container->selectConversationPair(mSessionID, ! getHost()); container->showStub(! getHost()); } } @@ -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(); } |