diff options
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index d958109927..522de30467 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -67,6 +67,9 @@ static LLRegisterPanelClassWrapper<LLSidepanelInventory> t_inventory("sidepanel_ // No longer want the inbox panel to auto-expand since it creates issues with the "new" tag time stamp #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 + static const char * const INBOX_BUTTON_NAME = "inbox_btn"; static const char * const OUTBOX_BUTTON_NAME = "outbox_btn"; @@ -310,6 +313,7 @@ void LLSidepanelInventory::handleLoginComplete() enableInbox(true); } +#if ENABLE_MERCHANT_OUTBOX_PANEL // Set up observer for outbox changes, if we have an outbox already if (!outbox_id.isNull()) { @@ -318,6 +322,7 @@ void LLSidepanelInventory::handleLoginComplete() // Enable the display of the outbox if it exists enableOutbox(true); } +#endif } void LLSidepanelInventory::observeInboxOutboxCreation() diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index e403034eaf..06104bc457 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1366,6 +1366,10 @@ void LLViewerMedia::removeCookie(const std::string &name, const std::string &dom } +// This is defined in two files but I don't want to create a dependence between this and llsidepanelinventory +// just to be able to temporarily disable the outbox. +#define ENABLE_INVENTORY_DISPLAY_OUTBOX 0 // keep in sync with ENABLE_MERCHANT_OUTBOX_PANEL + class LLInventoryUserStatusResponder : public LLHTTPClient::Responder { public: @@ -1386,7 +1390,10 @@ public: // Complete success gSavedSettings.setBOOL("InventoryDisplayInbox", true); + +#if ENABLE_INVENTORY_DISPLAY_OUTBOX gSavedSettings.setBOOL("InventoryDisplayOutbox", true); +#endif } else if (status == 401) { |