From 65f585ce47b245b2ef380776bba0ff2e2575afa1 Mon Sep 17 00:00:00 2001
From: gwigz <gwigz@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:09:17 +0100
Subject: [PATCH] Add Toggle HUDs toolbar command

Expose a "Toggle HUDs" button in the toybox that shows/hides HUD
attachments, wrapping the existing `View.ShowHUDAttachments` /
`View.CheckHUDAttachments` handlers. The 18x18 `toggle_hud.png` icon is
adapted from Phosphor Icons toggle glyph.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 indra/newview/app_settings/commands.xml           |   9 +++++++++
 indra/newview/llviewermenu.cpp                    |  12 ++++++++++++
 indra/newview/skins/alchemy/textures/textures.xml |   1 +
 indra/newview/skins/default/textures/textures.xml |   1 +
 .../default/textures/toolbar_icons/toggle_hud.png | Bin 0 -> 430 bytes
 indra/newview/skins/default/xui/en/strings.xml    |   2 ++
 indra/newview/skins/gemini/textures/textures.xml  |   1 +
 7 files changed, 26 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/toggle_hud.png

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 63b9e13665..2cff9a082a 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -358,6 +358,15 @@
            is_running_function="Agent.IsMicrophoneOn"
            is_running_parameters="speak"
            />
+  <command name="toggle_hud"
+           available_in_toybox="true"
+           icon="Command_ToggleHUD_Icon"
+           label_ref="Command_ToggleHUD_Label"
+           tooltip_ref="Command_ToggleHUD_Tooltip"
+           execute_function="View.ShowHUDAttachments"
+           is_running_function="View.CheckHUDAttachments"
+           is_enabled_function="View.EnableHUDAttachments"
+           />
   <command name="view"
            available_in_toybox="true"
            icon="Command_View_Icon"
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 5e203ce031..170273c6e9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9888,6 +9888,17 @@ class LLViewCheckHUDAttachments : public view_listener_t
     }
 };
 
+class LLViewEnableHUDAttachments : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        // Disable the toggle while an RLV lock forces a HUD to stay shown (matches LLViewShowHUDAttachments).
+        if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.hasLockedHUD()) && (LLPipeline::sShowHUDAttachments) )
+            return false;
+        return true;
+    }
+};
+
 class LLEditEnableTakeOff : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
@@ -10444,6 +10455,7 @@ void initialize_menus()
     view_listener_t::addMenu(new LLViewStatusAway(), "View.Status.CheckAway");
     view_listener_t::addMenu(new LLViewStatusDoNotDisturb(), "View.Status.CheckDoNotDisturb");
     view_listener_t::addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
+    view_listener_t::addMenu(new LLViewEnableHUDAttachments(), "View.EnableHUDAttachments");
 
     //Communicate Nearby chat
     view_listener_t::addMenu(new LLCommunicateNearbyChat(), "Communicate.NearbyChat");
diff --git a/indra/newview/skins/alchemy/textures/textures.xml b/indra/newview/skins/alchemy/textures/textures.xml
index 8d3ebb884c..02e208c611 100644
--- a/indra/newview/skins/alchemy/textures/textures.xml
+++ b/indra/newview/skins/alchemy/textures/textures.xml
@@ -160,6 +160,7 @@ with the same filename but different name
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
+  <texture name="Command_ToggleHUD_Icon"    file_name="toolbar_icons/toggle_hud.png"  preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
   <texture name="Command_Webbrowser_Icon"   file_name="toolbar_icons/web.png"          preload="true" />
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index dbaffd6995..da19a06371 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -176,6 +176,7 @@ with the same filename but different name
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Snapshot_Disk_Icon" file_name="toolbar_icons/snapshot_disk.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
+  <texture name="Command_ToggleHUD_Icon"    file_name="toolbar_icons/toggle_hud.png"  preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
   <texture name="Command_Webbrowser_Icon"   file_name="toolbar_icons/web.png"          preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/toggle_hud.png b/indra/newview/skins/default/textures/toolbar_icons/toggle_hud.png
new file mode 100644
index 0000000000000000000000000000000000000000..9797b8a79ae87834b08a2a664cc5538bbcd2696e
GIT binary patch
literal 430
zcmV;f0a5;mP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0004XNkl<Zc$}@1
zJ#NA<7>45?Y^oH2GL(%D*|-1$6JvXVa0S#$<PsbKdV@+;FTe#DKr9(6gaR}zGGJG)
ziIGZ&(84Q4w!eJu<IjJdcTG`BJwk{VhGEJ4L17q{;Det7WQ?)jY&P3QQFQP7ez|D!
zEXy{?cVpr@l}d#)8V!-A=?+lLg!WV}j<!~-@gzyqdc8g*A{fVU$NWQa9CzS9RwRV*
zn$6~o0~g8U)sDyGFQwE0RIk@*tJS(wO6|xwlw7Dt2*F3A(Yp;yr_(ocfhLp5tDPN#
ze!m|Lhr^d@wOZC%|K8;jQA){jx!iQS-G^SU_w0^euU4xxNs`YX2)6tEz7WJ1Ba6ji
z3m^OzL<pgr^OBU3NGaL5ASvYzKI?Zs^5wd=5M=U8>~g7hCDChv_>o8{#kv_|fa@Y7
zW6b8mcLZVAvn>0V&*%0Lp1aw|hwsO!wcG7S^nKsI)mj%;gh~K`4}KdQ3<gh^+-&&2
Y0fT3mX>MjAj{pDw07*qoM6N<$g8bUVW&i*H

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1f564827f2..68470af05f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4259,6 +4259,7 @@ name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_Snapshot_Label">Snapshot</string>
   <string name="Command_Snapshot_Disk_Label">Snapshot to Disk</string>
   <string name="Command_Speak_Label">Speak</string>
+  <string name="Command_ToggleHUD_Label">Toggle HUDs</string>
   <string name="Command_View_Label">Camera</string>
   <string name="Command_Voice_Label">Voice Settings</string>
   <string name="Command_Webbrowser_Label">Web Browser</string>
@@ -4303,6 +4304,7 @@ name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_Snapshot_Tooltip">Open the snapshot floater</string>
   <string name="Command_Snapshot_Disk_Tooltip">Take a picture immediately</string>
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
+  <string name="Command_ToggleHUD_Tooltip">Show or hide HUD attachments</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
   <string name="Command_Webbrowser_Tooltip">Open a web browser inside [APP_NAME]</string>
diff --git a/indra/newview/skins/gemini/textures/textures.xml b/indra/newview/skins/gemini/textures/textures.xml
index 2857b54284..8156daf83e 100644
--- a/indra/newview/skins/gemini/textures/textures.xml
+++ b/indra/newview/skins/gemini/textures/textures.xml
@@ -155,6 +155,7 @@ with the same filename but different name
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
+  <texture name="Command_ToggleHUD_Icon"    file_name="toolbar_icons/toggle_hud.png"  preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
   <texture name="Caret_Bottom_Icon"         file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" />