diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-01-24 17:50:19 +0100 |
|---|---|---|
| committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-01-24 17:50:43 +0100 |
| commit | c5f4eb32a97457e77cd178fc7769b1eb951e0ff3 (patch) | |
| tree | 8dfd6f771d29411c7735188a6e53075aaabbd9c1 /indra | |
| parent | fea01389c94002ffce639cab164280b3e558147c (diff) | |
SL-20416 Use image from file for emoji_recent_panel_toggle_btn
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/emoji_picker_icon.png | bin | 0 -> 921 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 1e0540c88a..2cb2ea0553 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -258,7 +258,6 @@ BOOL LLFloaterIMSessionTab::postBuild() mTearOffBtn->setCommitCallback(boost::bind(&LLFloaterIMSessionTab::onTearOffClicked, this)); mEmojiRecentPanelToggleBtn = getChild<LLButton>("emoji_recent_panel_toggle_btn"); - mEmojiRecentPanelToggleBtn->setLabel(LLUIString(LLWString(1, 128512))); mEmojiRecentPanelToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiRecentPanelToggleBtnClicked(); }); mEmojiRecentPanel = getChild<LLLayoutPanel>("emoji_recent_layout_panel"); diff --git a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png Binary files differnew file mode 100644 index 0000000000..ad4f3fa63c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f9a1c76689..1a49ec7e24 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -206,6 +206,7 @@ with the same filename but different name <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" /> + <texture name="Emoji_Picker_Icon" file_name="icons/emoji_picker_icon.png" preload="true" /> <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" /> <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" /> 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 94400f6501..c3e002e97d 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -304,12 +304,12 @@ name="emoji_recent_panel_toggle_btn" tool_tip="Shows/hides recent emojis" follows="right|bottom" - use_font_color="true" font="EmojiLarge" tab_stop="false" image_hover_unselected="Toolbar_Middle_Over" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" + image_overlay="Emoji_Picker_Icon" bottom="-2" right="-1" height="25" |
