diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-05 10:43:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-05 10:43:14 -0400 |
| commit | c432ee1581614ea75230bc59d90671eac875527f (patch) | |
| tree | 10f4b2c4db1dd1e7d79b2ac49e0c6f2f7e23def8 | |
| parent | 2ad0bc334dc275f60889d7f083e90b8d2775104d (diff) | |
| parent | f9879b8ea922affd4a1e82c45ce120d5e016c705 (diff) | |
merge changes for storm-1845
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 89fcfd0601..8f9b728c3b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -727,6 +727,8 @@ Marc2 Sands Marianne McCann Marine Kelley STORM-281 +MartinRJ Fayray + STORM-1845 Matthew Anthony Matthew Dowd VWR-1344 diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 5ba566b175..204b73b043 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -193,6 +193,15 @@ <menu_item_call.on_click function="View.ToggleUI" /> </menu_item_call> + <menu_item_check + label="Show HUD Attachments" + name="Show HUD Attachments" + shortcut="alt|shift|H"> + <menu_item_check.on_check + function="View.CheckHUDAttachments" /> + <menu_item_check.on_click + function="View.ShowHUDAttachments" /> + </menu_item_check> <menu_item_separator/> @@ -1374,15 +1383,6 @@ function="View.HighlightTransparent" /> </menu_item_check> <menu_item_check - label="Show HUD Attachments" - name="Show HUD Attachments" - shortcut="alt|shift|H"> - <menu_item_check.on_check - function="View.CheckHUDAttachments" /> - <menu_item_check.on_click - function="View.ShowHUDAttachments" /> - </menu_item_check> - <menu_item_check label="Show Mouselook Crosshairs" name="ShowCrosshairs"> <menu_item_check.on_check |