diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-07 19:00:35 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-07 19:00:35 -0800 |
| commit | 79b44fa561f58cdb47b7cfa6d0b55311d71688a8 (patch) | |
| tree | 0ad10576473d9ae9fa17d9b4b1db136871958ae4 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | a6f1690128b510977cfe86071f80f81967b9d0c7 (diff) | |
| parent | b1b4b78d5c97659d82ff67b38db4d4188967efbb (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index da25f95ffe..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(); } @@ -831,4 +827,16 @@ void LLFloaterIMSessionTab::getSelectedUUIDs(uuid_vec_t& selected_uuids) } } +LLConversationItem* LLFloaterIMSessionTab::getCurSelectedViewModelItem() +{ + LLConversationItem *conversationItem = NULL; + if(mConversationsRoot && + mConversationsRoot->getCurSelectedItem() && + mConversationsRoot->getCurSelectedItem()->getViewModelItem()) + { + conversationItem = static_cast<LLConversationItem *>(mConversationsRoot->getCurSelectedItem()->getViewModelItem()) ; + } + + return conversationItem; +} |