From c21c192d0c65e0e9b506e08a918d700a1e400725 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 13:01:11 +0100
Subject: [PATCH] EXT-7348 Can't open Advanced Menu in Linux Client
Added a new, preferred shortcut for Show Advanced Menu, that isn't eaten by the desktop on Linux. The old shortcut also works.
---
.../skins/default/xui/en/menu_viewer.xml | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2641ce4ee4d..35573187055 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -927,7 +927,7 @@
<menu_item_check
label="Show Advanced Menu"
name="Show Advanced Menu"
- shortcut="control|alt|D">
+ shortcut="control|alt|shift|D">
<on_check
function="CheckControl"
parameter="UseDebugMenus" />
@@ -1477,6 +1477,18 @@
<menu_item_call.on_click
function="View.DefaultUISize" />
</menu_item_call>
+ <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
+ <menu_item_check
+ label="Show Advanced Menu - legacy shortcut"
+ name="Show Advanced Menu - legacy shortcut"
+ shortcut="control|alt|D">
+ <on_check
+ function="CheckControl"
+ parameter="UseDebugMenus" />
+ <on_click
+ function="ToggleControl"
+ parameter="UseDebugMenus" />
+ </menu_item_check>
<menu_item_separator/>
<menu_item_check
label="Always Run"
@@ -1652,7 +1664,6 @@
function="ToggleControl"
parameter="QAMode" />
</menu_item_check>
-
</menu>
<menu
create_jump_keys="true"
@@ -3278,4 +3289,4 @@
</menu>
</menu>
</menu>
-</menu_bar>
\ No newline at end of file
+</menu_bar>
--
GitLab