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

EXP-985 FIX -- Always show Inbox panel if "Received Items" folder exists 

The presence of the inbox folder now forces the "Received Items" folder to be visible.
The same logic applies to the outbox as well.

Reviewed by Richard.
master
Leslie Linden 2011-07-07 12:58:06 -07:00
parent e4bb8a442d
commit 8e9fd4bdf2
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llsidepanelinventory.cpp
View File

@ -165,6 +165,13 @@ void handleInventoryDisplayInboxChanged()
sidepanel_inventory->enableInbox(gSavedSettings.getBOOL("InventoryDisplayInbox"));
}
void handleInventoryDisplayOutboxChanged()
{
LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(LLSideTray::getInstance()->getPanel("sidepanel_inventory"));
sidepanel_inventory->enableOutbox(gSavedSettings.getBOOL("InventoryDisplayOutbox"));
}
BOOL LLSidepanelInventory::postBuild()
{
// UI elements from inventory panel
@ -258,6 +265,7 @@ BOOL LLSidepanelInventory::postBuild()
}
gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
gSavedSettings.getControl("InventoryDisplayOutbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayOutboxChanged));
return TRUE;
}
@ -284,12 +292,18 @@ void LLSidepanelInventory::handleLoginComplete()
if (!inbox_id.isNull())
{
observeInboxModifications(inbox_id);
// Enable the display of the inbox if it exists
enableInbox(true);
}
// Set up observer for outbox changes, if we have an outbox already
if (!outbox_id.isNull())
{
observeOutboxModifications(outbox_id);
// Enable the display of the outbox if it exists
enableOutbox(true);
}
}

2
indra/newview/llviewermedia.cpp
View File

@ -1385,7 +1385,7 @@ public:
else
{
// API in unavailable
llinfos << "Marketplace API is unavailable -- Inbox Disabled, status = " << status << ", reason = " << reason << llendl;
llinfos << "Marketplace API is unavailable -- Inbox may be disabled, status = " << status << ", reason = " << reason << llendl;
}
}
};