livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1845

meow-7.2.2
Oz Linden 2012-06-05 10:43:14 -04:00
parent 2ad0bc334d f9879b8ea9
commit c432ee1581
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -727,6 +727,8 @@ Marc2 Sands
Marianne McCann
Marine Kelley
STORM-281
MartinRJ Fayray
STORM-1845
Matthew Anthony
Matthew Dowd
VWR-1344

18
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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/>
@ -1373,15 +1382,6 @@
<menu_item_check.on_click
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">