Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions indra/newview/app_settings/commands.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions indra/newview/llviewermenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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");
Expand Down
1 change: 1 addition & 0 deletions indra/newview/skins/alchemy/textures/textures.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions indra/newview/skins/default/textures/textures.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions indra/newview/skins/default/xui/en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions indra/newview/skins/gemini/textures/textures.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading