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.

meow-7.2.2
Gilbert Gonzales 2013-03-27 15:42:34 -07:00
parent ba757c18f8
commit 4146dc326f
1 changed files with 2 additions and 6 deletions

View File

@ -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)
{