From 700af52476c7f097db1e0c9c57c1c9c1958f0764 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 30 Jul 2020 13:03:42 +0200 Subject: [PATCH] Undo some terrible cruft regarding mini icons in chat history headers --- indra/newview/fschathistory.cpp | 76 ++++++++--------- indra/newview/fschatoptionsmenu.cpp | 4 + .../default/xui/de/menu_fs_chat_options.xml | 1 + .../default/xui/en/menu_fs_chat_options.xml | 13 +++ .../default/xui/en/panel_chat_header.xml | 85 ++++++++++++------- 5 files changed, 107 insertions(+), 72 deletions(-) diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index 17d9670ffd..b6849cf35f 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -362,94 +362,94 @@ public: void onAvatarIconContextMenuItemClicked(const LLSD& userdata) { - std::string level = userdata.asString(); + std::string param = userdata.asString(); - if (level == "profile") + if (param == "profile") { LLAvatarActions::showProfile(getAvatarId()); } - else if (level == "im") + else if (param == "im") { LLAvatarActions::startIM(getAvatarId()); } - else if (level == "teleport_to") + else if (param == "teleport_to") { LLAvatarActions::teleportTo(getAvatarId()); } - else if (level == "teleport") + else if (param == "teleport") { LLAvatarActions::offerTeleport(getAvatarId()); } - else if (level == "request_teleport") + else if (param == "request_teleport") { LLAvatarActions::teleportRequest(getAvatarId()); } - else if (level == "voice_call") + else if (param == "voice_call") { LLAvatarActions::startCall(getAvatarId()); } - else if (level == "chat_history") + else if (param == "chat_history") { LLAvatarActions::viewChatHistory(getAvatarId()); } - else if (level == "add") + else if (param == "add") { LLAvatarActions::requestFriendshipDialog(getAvatarId(), mFrom); } - else if (level == "add_set") + else if (param == "add_set") { LLAvatarActions::addToContactSet(getAvatarId()); } - else if (level == "remove") + else if (param == "remove") { LLAvatarActions::removeFriendDialog(getAvatarId()); } - else if (level == "invite_to_group") + else if (param == "invite_to_group") { LLAvatarActions::inviteToGroup(getAvatarId()); } - else if (level == "zoom_in") + else if (param == "zoom_in") { handle_zoom_to_object(getAvatarId()); } - else if (level == "map") + else if (param == "map") { LLAvatarActions::showOnMap(getAvatarId()); } - else if (level == "track") + else if (param == "track") { LLAvatarActions::track(getAvatarId()); } - else if (level == "share") + else if (param == "share") { LLAvatarActions::share(getAvatarId()); } - else if (level == "pay") + else if (param == "pay") { LLAvatarActions::pay(getAvatarId()); } - else if (level == "copy_name") + else if (param == "copy_name") { LLUrlAction::copyLabelToClipboard(LLSLURL("agent", getAvatarId(), "inspect").getSLURLString()); } - else if (level == "copy_url") + else if (param == "copy_url") { LLUrlAction::copyURLToClipboard(LLSLURL("agent", getAvatarId(), "about").getSLURLString()); } - else if(level == "block_unblock") + else if (param == "block_unblock") { LLAvatarActions::toggleMute(getAvatarId(), LLMute::flagVoiceChat); } - else if(level == "mute_unmute") + else if (param == "mute_unmute") { LLAvatarActions::toggleMute(getAvatarId(), LLMute::flagTextChat); } - else if(level == "toggle_allow_text_chat") + else if (param == "toggle_allow_text_chat") { LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID); speaker_mgr->toggleAllowTextChat(getAvatarId()); } - else if(level == "group_mute") + else if (param == "group_mute") { LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID); if (speaker_mgr) @@ -457,7 +457,7 @@ public: speaker_mgr->moderateVoiceParticipant(getAvatarId(), false); } } - else if(level == "group_unmute") + else if (param == "group_unmute") { LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID); if (speaker_mgr) @@ -465,7 +465,7 @@ public: speaker_mgr->moderateVoiceParticipant(getAvatarId(), true); } } - else if(level == "ban_member") + else if (param == "ban_member") { banGroupMember(getAvatarId()); } @@ -473,17 +473,17 @@ public: bool onAvatarIconContextMenuItemChecked(const LLSD& userdata) { - std::string level = userdata.asString(); + std::string param = userdata.asString(); - if (level == "is_blocked") + if (param == "is_blocked") { return LLMuteList::getInstance()->isMuted(getAvatarId(), LLMute::flagVoiceChat); } - if (level == "is_muted") + if (param == "is_muted") { return LLMuteList::getInstance()->isMuted(getAvatarId(), LLMute::flagTextChat); } - else if (level == "is_allowed_text_chat") + else if (param == "is_allowed_text_chat") { if (gAgent.isInGroup(mSessionID)) { @@ -502,13 +502,13 @@ public: bool onAvatarIconContextMenuItemEnabled(const LLSD& userdata) { - std::string level = userdata.asString(); + std::string param = userdata.asString(); - if (level == "can_allow_text_chat" || level == "can_mute" || level == "can_unmute") + if (param == "can_allow_text_chat" || param == "can_mute" || param == "can_unmute") { return canModerate(userdata); } - else if (level == "can_ban_member") + else if (param == "can_ban_member") { return canBanGroupMember(getAvatarId()); } @@ -517,9 +517,9 @@ public: bool onAvatarIconContextMenuItemVisible(const LLSD& userdata) { - std::string level = userdata.asString(); + std::string param = userdata.asString(); - if (level == "show_mute") + if (param == "show_mute") { LLSpeakerMgr * speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID); if (speaker_mgr) @@ -532,7 +532,7 @@ public: } return false; } - else if (level == "show_unmute") + else if (param == "show_unmute") { LLSpeakerMgr * speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID); if (speaker_mgr) @@ -782,12 +782,6 @@ public: // Set up the icon. LLAvatarIconCtrl* icon = getChild("avatar_icon"); - - // Hacky preference to hide avatar icons for people who don't like them by overdrawing them. Will change to disable soon. -AO - if (!gSavedSettings.getBOOL("ShowChatMiniIcons")) - { - icon->setColor(LLUIColorTable::instance().getColor("Transparent")); - } if(mSourceType != CHAT_SOURCE_AGENT || mAvatarID.isNull()) icon->setDrawTooltip(false); diff --git a/indra/newview/fschatoptionsmenu.cpp b/indra/newview/fschatoptionsmenu.cpp index b9a23f759a..960016f921 100644 --- a/indra/newview/fschatoptionsmenu.cpp +++ b/indra/newview/fschatoptionsmenu.cpp @@ -137,6 +137,10 @@ bool FSChatOptionsMenu::onMenuItemVisible(const LLSD& userdata, LLUICtrl* source { return (dynamic_cast(source) != NULL); } + else if (option == "show_mini_icons") + { + return !gSavedSettings.getBOOL("PlainTextChatHistory"); + } return false; } diff --git a/indra/newview/skins/default/xui/de/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/de/menu_fs_chat_options.xml index 2e8d331d50..ff5bf3780b 100644 --- a/indra/newview/skins/default/xui/de/menu_fs_chat_options.xml +++ b/indra/newview/skins/default/xui/de/menu_fs_chat_options.xml @@ -4,6 +4,7 @@ + diff --git a/indra/newview/skins/default/xui/en/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/en/menu_fs_chat_options.xml index ada396a08f..49520b1856 100644 --- a/indra/newview/skins/default/xui/en/menu_fs_chat_options.xml +++ b/indra/newview/skins/default/xui/en/menu_fs_chat_options.xml @@ -41,6 +41,19 @@ function="ToggleControl" parameter="PlainTextChatHistory"/> + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index e24ae8c2d1..89b338b095 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -1,44 +1,67 @@ - - + + + + + + + +