summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Nikolenko <maximnproductengine@lindenlab.com>2026-05-13 12:01:24 +0300
committerGitHub <noreply@github.com>2026-05-13 12:01:24 +0300
commit5ffe81be36e55d12c926351c30036304cc6a106e (patch)
tree4c76e0c38e072daa3662898d65a475265de52ec0
parent064ee01a487701ec43829a57b4ba0cb72e9ff5d0 (diff)
#5801 add Mute sound menu option
-rw-r--r--indra/newview/llviewermenu.cpp12
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
2 files changed, 21 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8d6b8ec713..46dfa61870 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9641,6 +9641,16 @@ void handle_flush_name_caches()
if (gCacheName) gCacheName->clear();
}
+bool is_master_audio_muted()
+{
+ return LLAppViewer::instance()->getMasterSystemAudioMute();
+}
+
+void toggle_master_audio()
+{
+ LLAppViewer::instance()->setMasterSystemAudioMute(!is_master_audio_muted());
+}
+
class LLUploadCostCalculator : public view_listener_t
{
std::string mCostStr;
@@ -9912,6 +9922,8 @@ void initialize_menus()
view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset");
view_listener_t::addMenu(new LLWorldCheckBanLines() , "World.CheckBanLines");
view_listener_t::addMenu(new LLWorldShowBanLines() , "World.ShowBanLines");
+ commit.add("World.ToggleMasterAudio", boost::bind(&toggle_master_audio));
+ enable.add("World.IsMasterAudioMuted", boost::bind(&is_master_audio_muted));
// Tools menu
view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f7541f52ad..591bf6c712 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1030,7 +1030,15 @@
parameter="pause_clouds" />
</menu_item_check>
</menu>
-
+ <menu_item_check
+ label="Mute/unmute sound"
+ name="toggle_sound"
+ shortcut="control|alt|shift|M">
+ <menu_item_check.on_click
+ function="World.ToggleMasterAudio"/>
+ <menu_item_check.on_check
+ function="World.IsMasterAudioMuted"/>
+ </menu_item_check>
<!--
<menu
create_jump_keys="true"