diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-02-06 11:00:08 -0800 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-06 11:00:08 -0800 |
commit | a61bb4eb21fb834480dbfe62a6722ba5c61720f0 (patch) | |
tree | 2bfa177bee8c5ca5791174947ad38c93389b4d87 /indra/newview/skins/default | |
parent | 06a7f5ad02f7f81c06dc50fca6e29e5322c5631e (diff) | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 33a756fdd5..d8f9453b09 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -153,13 +153,6 @@ function="BuyCurrency" /> </menu_item_call> <menu_item_call - label="Merchant Outbox..." - name="MerchantOutbox"> - <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="outbox" /> - </menu_item_call> - <menu_item_call label="Account dashboard..." name="Manage My Account"> <menu_item_call.on_click @@ -2457,6 +2450,16 @@ function="Advanced.ToggleInfoDisplay" parameter="rendercomplexity" /> </menu_item_check> + <menu_item_check + label="Attachment Bytes" + name="attachment bytes"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="attachment bytes" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="attachment bytes" /> + </menu_item_check> <menu_item_check label="Sculpt" name="Sculpt"> |