diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 12:32:07 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 12:32:07 -0700 |
| commit | 8b1ce96eaefc7d977a084e421834330a57f26b37 (patch) | |
| tree | 926987b9f81ba8a4338a1c6f851a5a07126a8e51 /indra/newview/llsidepanelinventory.cpp | |
| parent | 719a8409d0f43696cdf6f66517c7a4a8911fd67d (diff) | |
| parent | 4ad3676985fa6abbb764136f1ec658ddcf296058 (diff) | |
merge
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 858639215c..9814e5b81a 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -68,7 +68,7 @@ static LLRegisterPanelClassWrapper<LLSidepanelInventory> t_inventory("sidepanel_ #define AUTO_EXPAND_INBOX 0 // Temporarily disabling the outbox until we straighten out the API -#define ENABLE_MERCHANT_OUTBOX_PANEL 0 // keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX +#define ENABLE_MERCHANT_OUTBOX_PANEL 0 // keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX, ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU static const char * const INBOX_BUTTON_NAME = "inbox_btn"; static const char * const OUTBOX_BUTTON_NAME = "outbox_btn"; |