From 09b52ab8234eb33306ab4c9dbac6a97e4114314a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 3 Mar 2024 01:24:09 +0100 Subject: [PATCH] Fix the emoji buttons the intended way as seen on the LL viewer --- indra/newview/fsfloaterim.cpp | 1 - indra/newview/fsfloaternearbychat.cpp | 1 - indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index 897289cc91..c3b25270d2 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -973,7 +973,6 @@ BOOL FSFloaterIM::postBuild() mEmojiRecentIconsCtrl->setVisible(false); mEmojiPickerToggleBtn = getChild("emoji_picker_toggle_btn"); - mEmojiPickerToggleBtn->setLabel(LLUIString(LLWString(1, 128512))); mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); }); mRecentEmojisUpdatedCallbackConnection = LLFloaterEmojiPicker::setRecentEmojisUpdatedCallback([this](const std::list& recent_emojis_list) { initEmojiRecentPanel(); }); diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp index db9c677fdf..b2922e5f57 100644 --- a/indra/newview/fsfloaternearbychat.cpp +++ b/indra/newview/fsfloaternearbychat.cpp @@ -162,7 +162,6 @@ BOOL FSFloaterNearbyChat::postBuild() mEmojiRecentIconsCtrl->setVisible(false); mEmojiPickerToggleBtn = getChild("emoji_picker_toggle_btn"); - mEmojiPickerToggleBtn->setLabel(LLUIString(LLWString(1, 128512))); mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); }); mRecentEmojisUpdatedCallbackConnection = LLFloaterEmojiPicker::setRecentEmojisUpdatedCallback([this](const std::list& recent_emojis_list) { initEmojiRecentPanel(); }); diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml index 4dfff97bd0..7a273af34c 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml @@ -285,6 +285,7 @@ image_hover_unselected="Toolbar_Middle_Over" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" + image_overlay="Emoji_Picker_Icon" right="-11" name="emoji_picker_toggle_btn" tool_tip="Show emoji panel"