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: [PATCH] SL-20416 Use image from file for
emoji_recent_panel_toggle_btn
---
indra/newview/llfloaterimsessiontab.cpp | 1 -
.../default/textures/icons/emoji_picker_icon.png | Bin 0 -> 921 bytes
indra/newview/skins/default/textures/textures.xml | 1 +
.../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
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 1e0540c88af..2cb2ea0553f 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 0000000000000000000000000000000000000000..ad4f3fa63c170d190a54eb3dd62daefc67037794
GIT binary patch
literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000AENkl<Zc-k~m
zTS(JU82`5abl&DIajAHzc~?YZ-f|iW4N|s;$cF;aPzII{y+l|(2ubziLp=n#7ZWss
zob&o%Wh5y=3hMBJn{zrvopa)xx83@kKXqQV|2g0JzTfQ#N=iy7I5?P8Diy`V#865~
z%I&PItVcmXK?xkki3I`ydA;7N<Ktti#bW7SU0waXwzftS6BERiNGKGN-EJqJ&qvkO
z)$gODqi=0(ZT&KtOga=AahcFimXMH8Ra#p5E-fu>ad~<9sm*31sZ>gW?Cfk3i^ViE
zGc%4~_t@B2qr>5_MMg%_?(QzR-EK-sO5%s0c{Gq}Pfkw4ii(Pq7Z(>KjEIP!zP`SX
zX0ti4uC7jfaByG)blTb3;ZZS!?EgQcM-2@P_xJYp`~w36-4cm}xc2t;LZwov>FDUV
zJ2f@s0Z+=w$)UNqIYKi6cOFS>Y%KNn_Y>gL;o;$z`uh5|(9lo=r`2lTg0Eq6a&nxZ
zk;~<!EiEnDjg5`TqoX4yLz9}CDs5_N`U)gl(8K~^y)v0B8QR<xqKnjMG!7;vCKBU>
zb%qIM2<V35WH1<LWo5+!_-0UYou8jme0)6H)5EoEA}l`?H8G*)=jUm7cz7W>Ik{P{
z*AuMdxdXPnu&}UMr_=GuV>+X@0VEy~8_ASrcA<!OBp@JwpbOR1)DX+T=;$bggoKb<
zt)|P%%m4L$oC!o8kB4=YEi5eTvqLt)<#O@G%wpD<p*TG~rSR}@T3lSDz`#Jt&CR`u
zGfs$N8$?n=G#;`-p?F<hUjEW*wGynQ&CN~P-rlC-;^G&Tm6dOx8Lh9cGhtQ8gM)f{
zdW!vi{~wJ;BQ7W?VBboh`VJxW2vjGyc0!{;O#1;F@8#v?5iAt3J3~W53J#&zsi>%s
zBc@LvVsBJblnIJ|3JVMKIh{@^rueR|uD(rAPd^75Bcs{Y);5eYb8Bns2SG+g1~FJD
zn1FyzxX_3IIT%kCDkd1<@)jfB5w*3o-PnsMD=VvFA>-21)A>Vm?nSdZ`T6<J5cwN$
z!V8#QT#}#x*cCj+%Y6k})~>Fu2eY%Y#DXV)IQ(<QOQg8CILge-tUwMP!nW&hiDNb+
vK;E;nvwf`3OG`^XS+qw+MhJWKSAYQkMfu%*I0vgd00000NkvXXu0mjf?O?Yr
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f9a1c76689b..1a49ec7e247 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 94400f6501a..c3e002e97df 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"
--
GitLab