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

merge changes for vmrg-222

meow-7.2.2
Oz Linden 2012-02-03 18:35:46 -05:00
parent 36aba26615 a89fbc1d33
commit 099ce3cbde
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llinventorybridge.cpp
View File

@ -73,7 +73,7 @@
#include "llwearablelist.h"
// Marketplace outbox current disabled
#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1
#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 0
#define ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU 0
#define BLOCK_WORN_ITEMS_IN_OUTBOX 1

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

@ -152,13 +152,6 @@
<menu_item_call.on_click
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">