diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 41 |
1 files changed, 39 insertions, 2 deletions
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 fc54710941..56965ba7bc 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -300,8 +300,8 @@ right="-30" wrap="true" /> <button - name="emoji_panel_btn" - tool_tip="Shows/hides emoji picker" + name="emoji_recent_panel_toggle_btn" + tool_tip="Shows/hides recent emojis" follows="right|bottom" use_font_color="true" font="EmojiLarge" @@ -332,6 +332,43 @@ </layout_panel> </layout_stack> </layout_panel> + <layout_panel + name="emoji_recent_layout_panel" + height="35" + auto_resize="false"> + <text + name="emoji_recent_empty_text" + follows="top|left|right" + layout="topleft" + auto_resize="false" + h_pad="20" + v_pad="10" + top="0" + left="5" + right="-60" + height="30" + >Recently used emojis will appear here</text> + <emoji_complete + name="emoji_recent_icons_ctrl" + follows="top|left|right" + layout="topleft" + noscroll="true" + max_emoji="20" + top="0" + left="5" + right="-60" + height="30"/> + <button + name="emoji_picker_toggle_btn" + label="More" + tool_tip="Shows/hides emoji picker" + follows="right|bottom" + layout="topleft" + bottom="-5" + right="-5" + height="30" + width="60"/> + </layout_panel> </layout_stack> </view> </floater> |