Skip to content

Commit 63ff4e2

Browse files
committed
Revert "focusFirstItem was no longer being overridden here, this function has proven not needed, thus."
This reverts commit 6550813.
1 parent d1cfe54 commit 63ff4e2

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

indra/newview/llimpanel.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,6 +1576,17 @@ const bool LLFloaterIMPanel::isModerator(const LLUUID& speaker_id)
15761576
return false;
15771577
}
15781578

1579+
BOOL LLFloaterIMPanel::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash )
1580+
{
1581+
if (getVisible() && mInputEditor->getVisible())
1582+
{
1583+
setInputFocus(true);
1584+
return TRUE;
1585+
}
1586+
1587+
return LLUICtrl::focusFirstItem(prefer_text_fields, focus_flash);
1588+
}
1589+
15791590
void LLFloaterIMPanel::onFocusReceived()
15801591
{
15811592
mNumUnreadMessages = 0;

indra/newview/llimpanel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ class LLFloaterIMPanel : public LLFloater, public LLFriendObserver
9494
void *cargo_data, EAcceptance *accept,
9595
std::string& tooltip_msg);
9696

97+
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
98+
9799
void onFocusReceived();
98100
void onInputEditorFocusReceived();
99101
void onInputEditorKeystroke(LLLineEditor* caller);

0 commit comments

Comments
 (0)