diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-20 14:16:24 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-20 14:16:24 -0700 |
| commit | d7104eac393242b42eae77717326009a05480578 (patch) | |
| tree | 2a81d4a9ec484e460affe877de44236c7ebd6847 | |
| parent | 45c48f7cd3fc6b94932004db8e29906d65a55344 (diff) | |
| parent | 5b89ba6942ebaa593914d9dc34794239aec8542f (diff) | |
merge
| -rw-r--r-- | indra/newview/llpanelmarketplaceinboxinventory.h | 2 | ||||
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h index d2d42e11f4..8946b9dc98 100644 --- a/indra/newview/llpanelmarketplaceinboxinventory.h +++ b/indra/newview/llpanelmarketplaceinboxinventory.h @@ -33,7 +33,7 @@ #include "llfolderviewitem.h" -#define SUPPORTING_FRESH_ITEM_COUNT 1 +#define SUPPORTING_FRESH_ITEM_COUNT 0 diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index a0d1247b34..6f809ba3ca 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -456,8 +456,8 @@ void LLSidepanelInventory::onToggleInboxBtn() LLButton* otherButton = getChild<LLButton>(OUTBOX_BUTTON_NAME); LLLayoutPanel* otherPanel = getChild<LLLayoutPanel>(OUTBOX_LAYOUT_PANEL_NAME); - bool inboxExpanded = manageInboxOutboxPanels(stack, pressedButton, pressedPanel, otherButton, otherPanel); -
+ manageInboxOutboxPanels(stack, pressedButton, pressedPanel, otherButton, otherPanel); + gSavedPerAccountSettings.setString("LastInventoryInboxExpand", LLDate::now().asString()); } |