diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-27 15:42:34 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-27 15:42:34 -0700 |
| commit | 4146dc326f7f49f4414a10fc20f5f9302bf4de85 (patch) | |
| tree | 08d5a833a787f69a9cf7345979780e92f67c46f5 | |
| parent | ba757c18f83ce36a0420832f158cac6c760104e0 (diff) | |
CHUI-851 ([CHUIBUG]Focussing issue and unresponsive tabs when focus is brought back to the HUB): Now when pressing enter a docked nearby chat floater will be focused and the conversation line item will be selected. When the nearby chat is not docked then only the floater will be focused.
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 171509af59..1b98b94b71 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -327,11 +327,8 @@ void LLFloaterIMNearbyChat::onChatFontChange(LLFontGL* fontp) void LLFloaterIMNearbyChat::show() { - if (isChatMultiTab()) - { openFloater(getKey()); } -} bool LLFloaterIMNearbyChat::isChatVisible() const { @@ -746,15 +743,14 @@ void LLFloaterIMNearbyChat::startChat(const char* line) { if(!nearby_chat->isTornOff()) { - nearby_chat->show(); + LLFloaterIMContainer::getInstance()->selectConversation(LLUUID(NULL)); } if(nearby_chat->isMinimized()) { nearby_chat->setMinimized(false); } - nearby_chat->setVisible(TRUE); + nearby_chat->show(); nearby_chat->setFocus(TRUE); - nearby_chat->mInputEditor->setFocus(TRUE); if (line) { |