summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-03 18:35:46 -0500
committerOz Linden <oz@lindenlab.com>2012-02-03 18:35:46 -0500
commit099ce3cbde95d435d6f1b6691d27b72553527cff (patch)
treee7df81bea03a68c850f3da530261cb6360f49deb /indra/newview/skins
parent36aba266155bdb25b9887686016ad62b2250b509 (diff)
parenta89fbc1d3396d1fe5516571fd6d8651d60709784 (diff)
merge changes for vmrg-222
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml7
1 files changed, 0 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 1d11abcf73..cd8550b00d 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