From c5f4eb32a97457e77cd178fc7769b1eb951e0ff3 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 24 Jan 2024 17:50:19 +0100
Subject: SL-20416 Use image from file for emoji_recent_panel_toggle_btn

---
 indra/newview/llfloaterimsessiontab.cpp                   |   1 -
 .../skins/default/textures/icons/emoji_picker_icon.png    | Bin 0 -> 921 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 +
 indra/newview/skins/default/xui/en/floater_im_session.xml |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/emoji_picker_icon.png

(limited to 'indra')

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
new file mode 100644
index 0000000000..ad4f3fa63c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png differ
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"
-- 
cgit v1.2.3