From 4d6aefde72edf221f8c8018702eb068bb9acd41c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 18 Jan 2023 14:10:52 +0100 Subject: [PATCH 1/3] FIRE-32614: Fix chat console font size cannot be change on the fly anymore --- indra/newview/llviewercontrol.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index c64fdb05bf..9d2ca64635 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -1239,7 +1239,7 @@ void settings_setup_listeners() setting_setup_signal_listener(gSavedSettings, "RenderDeferredSSAO", handleSetShaderChanged); setting_setup_signal_listener(gSavedSettings, "RenderPerformanceTest", handleRenderPerfTestChanged); setting_setup_signal_listener(gSavedSettings, "TextureMemory", handleVideoMemoryChanged); - setting_setup_signal_listener(gSavedSettings, "ChatFontSize", handleChatFontSizeChanged); + setting_setup_signal_listener(gSavedSettings, "ChatConsoleFontSize", handleChatFontSizeChanged); setting_setup_signal_listener(gSavedSettings, "ChatPersistTime", handleChatPersistTimeChanged); setting_setup_signal_listener(gSavedSettings, "ConsoleMaxLines", handleConsoleMaxLinesChanged); setting_setup_signal_listener(gSavedSettings, "UploadBakedTexOld", handleUploadBakedTexOldChanged); From 9e6494e621b82852338c3ac58b6582927118d85b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 18 Jan 2023 14:28:04 +0100 Subject: [PATCH 2/3] FIRE-32602: Fix context menu missing in group member list --- indra/newview/llnamelistctrl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index df3c50b2ba..bc24c25bd7 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -300,9 +300,9 @@ BOOL LLNameListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask) { LLNameListItem* hit_item = dynamic_cast(hitItem(x, y)); LLFloater* floater = gFloaterView->getParentFloater(this); - if (floater && floater->isFrontmost() && hit_item) + if (floater && floater->isFrontmost() && hit_item && hit_item->isGroup()) // Fix wrong check { - if(hit_item->isGroup()) + //if(hit_item->isGroup()) // Fix wrong check { ContextMenuType prev_menu = getContextMenuType(); setContextMenu(MENU_GROUP); @@ -311,7 +311,9 @@ BOOL LLNameListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask) return handled; } } - return LLScrollListCtrl::handleRightMouseDown(x, y, mask); + // Inherit from FSScrollListCtrl for additional features + //return LLScrollListCtrl::handleRightMouseDown(x, y, mask); + return FSScrollListCtrl::handleRightMouseDown(x, y, mask); } // public From 4526e14388ce3c0242fee9b0f6798af38e314082 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 18 Jan 2023 15:00:43 +0100 Subject: [PATCH 3/3] FIRE-32520: Prevent log spam when show friends only is enabled --- indra/newview/llviewermessage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 94b07bda62..6e3b8b034d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5194,7 +5194,8 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) if (!avatarp) { // no agent by this ID...error? - LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL; + if (!gSavedSettings.getBOOL("FSRenderFriendsOnly")) // FIRE-32520: Prevent log spam when show friends only is enabled + LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL; return; }