From 4146dc326f7f49f4414a10fc20f5f9302bf4de85 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 27 Mar 2013 15:42:34 -0700
Subject: [PATCH] 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.
---
indra/newview/llfloaterimnearbychat.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 171509af59d..1b98b94b71d 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)
{
--
GitLab