diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-10 10:32:33 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-10 10:32:33 -0800 |
| commit | 3c591c1a929ddc8447620e5062401b6586ebc718 (patch) | |
| tree | 90ada0c932fce7c715ffab7be906c57a40948ebe /indra/newview/llfloaterimsessiontab.cpp | |
| parent | 9da625d439a9a911733564177e32facc3669dc58 (diff) | |
| parent | 08a7f4193b18ca5c0bbaf144232eeb2678205eae (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index b50b8c2d32..4c6d8fa5a0 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -167,12 +167,7 @@ void LLFloaterIMSessionTab::addToHost(const LLUUID& session_id) if (!conversp->isNearbyChat() || gSavedSettings.getBOOL("NearbyChatIsNotTornOff")) { - floater_container->addFloater(conversp, FALSE, LLTabContainer::END); - - if (!floater_container->getVisible()) - { - LLFloaterReg::toggleInstanceOrBringToFront("im_container"); - } + floater_container->addFloater(conversp, !floater_container->getVisible(), LLTabContainer::RIGHT_OF_CURRENT); } else { @@ -698,7 +693,8 @@ void LLFloaterIMSessionTab::updateCallBtnState(bool callIsActive) voiceButton->setToolTip( callIsActive? getString("end_call_button_tooltip") : getString("start_call_button_tooltip")); - enableDisableCallBtn(); + LLFloaterIMContainer::getInstance()->updateSpeakBtnState(); + enableDisableCallBtn(); } |