summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-27 18:47:54 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-27 18:47:54 +0200
commitabdfc65f56bdf5bba7977760c57b5c7de7a61931 (patch)
tree408b1db2a666d2216e36a810a45a7df12899aab9 /indra/newview/skins
parent958991ec4d0fa0e51f1410928de5b0d21f1720fb (diff)
SL-14424 Remove shortcut that conflicts with camera controls
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml17
1 files changed, 1 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 47c4a9593d..a59a71a0eb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -622,8 +622,7 @@
<menu_item_separator />
<menu_item_check
label="Advanced Menu"
- name="Show Advanced Menu"
- shortcut="control|alt|shift|D">
+ name="Show Advanced Menu">
<on_check
function="CheckControl"
parameter="UseDebugMenus" />
@@ -2001,20 +2000,6 @@ function="World.EnvPreset"
name="Shortcuts"
tear_off="true"
visible="false">
- <!-- 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_call
label="Close Window"