summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 04eebcefc1..b8adb2d919 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -253,11 +253,21 @@ bool LLPanelMainInventory::postBuild()
LLParamSDParser parser;
parser.readSD(recent_items, p);
mRecentPanel->getFilter().fromParams(p);
- mRecentPanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::RECENTITEMS_SORT_ORDER));
+
+ // Restore sort order if it was saved
+ if (p.order.isProvided())
+ {
+ mRecentPanel->setSortOrder(p.order());
+ }
+ else
+ {
+ mRecentPanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::RECENTITEMS_SORT_ORDER));
+ }
}
}
if(mActivePanel)
{
+ // 'all items' tab
if(savedFilterState.has(mActivePanel->getFilter().getName()))
{
LLSD items = savedFilterState.get(mActivePanel->getFilter().getName());