diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 6a3a6200e9..65655f82cd 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -303,7 +303,8 @@ void LLSidepanelInventory::handleLoginComplete() observeOutboxModifications(outbox_id); // Enable the display of the outbox if it exists - enableOutbox(true); + //enableOutbox(true); + // leslie NOTE: Disabling outbox until we support it officially. } } @@ -696,13 +697,13 @@ bool LLSidepanelInventory::canShare() mInventoryPanel->findChild<LLPanelMainInventory>("panel_main_inventory"); LLInventoryPanel* inbox = findChild<LLInventoryPanel>("inventory_inbox"); -
- // Avoid flicker in the Recent tab while inventory is being loaded.
- if ( (!inbox || inbox->getRootFolder()->getSelectionList().empty())
- && (panel_main_inventory && !panel_main_inventory->getActivePanel()->getRootFolder()->hasVisibleChildren()) )
- {
- return false;
- }
+ + // Avoid flicker in the Recent tab while inventory is being loaded. + if ( (!inbox || inbox->getRootFolder()->getSelectionList().empty()) + && (panel_main_inventory && !panel_main_inventory->getActivePanel()->getRootFolder()->hasVisibleChildren()) ) + { + return false; + } return ( (panel_main_inventory ? LLAvatarActions::canShareSelectedItems(panel_main_inventory->getActivePanel()) : false) || (inbox ? LLAvatarActions::canShareSelectedItems(inbox) : false) ); |