diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-15 16:03:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-15 16:03:34 -0500 |
| commit | 1b6ee87bc8efa0eace9441c8907c9743aaab19b4 (patch) | |
| tree | 723e3994f54526a0706a4287fa9d942df8cecbe1 | |
| parent | 821c964230ffc17ebf94f2d6af31eed226110267 (diff) | |
| parent | eb7b43fb558d66eb08b7a06ffdd578bfe94e5eb8 (diff) | |
merge changes for storm-1733
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 24 |
2 files changed, 13 insertions, 12 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 12eeab0628..276fd3c878 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -596,6 +596,7 @@ Jonathan Yap STORM-1712 STORM-1728 STORM-1736 + 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" |