summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-12-14 13:21:48 -0500
committerJonathan Yap <none@none>2011-12-14 13:21:48 -0500
commiteb7b43fb558d66eb08b7a06ffdd578bfe94e5eb8 (patch)
tree33f938002cabee12f79c24e199b81b4c022963a4
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
STORM-1733 Menu entry Release Keys is in Advanced->Shortcuts sub-menu but has no shortcut
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml24
2 files changed, 13 insertions, 12 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 274632a804..203f7d7f9f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -595,6 +595,7 @@ Jonathan Yap
STORM-1719
STORM-1712
STORM-1728
+ STORM-1733
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1834be2d48..0aa5c72f2a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1713,7 +1713,17 @@
function="ToggleControl"
parameter="MouseSmooth" />
</menu_item_check>
-
+ <menu_item_call
+ enabled="false"
+ label="Release Keys"
+ name="Release Keys">
+ <menu_item_call.on_click
+ function="Tools.ReleaseKeys"
+ parameter="" />
+ <menu_item_call.on_enable
+ function="Tools.EnableReleaseKeys"
+ parameter="" />
+ </menu_item_call>
<menu_item_separator/>
<menu
@@ -1743,17 +1753,7 @@
function="Floater.Toggle"
parameter="search" />
</menu_item_check>
- <menu_item_call
- enabled="false"
- label="Release Keys"
- name="Release Keys">
- <menu_item_call.on_click
- function="Tools.ReleaseKeys"
- parameter="" />
- <menu_item_call.on_enable
- function="Tools.EnableReleaseKeys"
- parameter="" />
- </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"