diff options
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 2cb2ea0553..24cc398f3b 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -465,6 +465,7 @@ void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked() void LLFloaterIMSessionTab::onEmojiPickerShowBtnClicked() { + mInputEditor->setFocus(TRUE); mInputEditor->showEmojiHelper(); } diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 1b6bc7025a..a6493c5e24 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -305,7 +305,6 @@ tool_tip="Shows/hides recent emojis" follows="right|bottom" font="EmojiLarge" - tab_stop="false" image_hover_unselected="Toolbar_Middle_Over" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" @@ -354,7 +353,6 @@ name="emoji_recent_icons_ctrl" follows="top|left|right" layout="topleft" - tab_stop="false" max_visible="20" top="0" left="1" @@ -366,7 +364,6 @@ tool_tip="Shows/hides emoji picker" follows="right|bottom" layout="topleft" - tab_stop="false" bottom="-5" right="-3" height="20" |