diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-04-12 17:50:05 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-04-12 17:50:05 +0300 |
| commit | c436716d92f3f38686b8d138e8e52a378c044490 (patch) | |
| tree | a9f5d5d7cb87973bbafe0dc4c6c9cdf95788f6a2 /indra/newview | |
| parent | e5048ad8b2648fa05f6a02cc39f06ce9ec53ec87 (diff) | |
MAINT-6301 Recent tab sorting changes do not persist between logins
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelmaininventory.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 4229419fce..973e1f7705 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -150,6 +150,7 @@ BOOL LLPanelMainInventory::postBuild() LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items"); if (recent_items_panel) { + // assign default values until we will be sure that we have setting to restore recent_items_panel->setSinceLogoff(TRUE); recent_items_panel->setSortOrder(LLInventoryFilter::SO_DATE); recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); @@ -181,6 +182,7 @@ BOOL LLPanelMainInventory::postBuild() LLParamSDParser parser; parser.readSD(recent_items, p); recent_items_panel->getFilter().fromParams(p); + recent_items_panel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::RECENTITEMS_SORT_ORDER)); } } @@ -372,7 +374,14 @@ void LLPanelMainInventory::setSortBy(const LLSD& userdata) } getActivePanel()->setSortOrder(sort_order_mask); - gSavedSettings.setU32("InventorySortOrder", sort_order_mask); + if ("Recent Items" == getActivePanel()->getName()) + { + gSavedSettings.setU32("RecentItemsSortOrder", sort_order_mask); + } + else + { + gSavedSettings.setU32("InventorySortOrder", sort_order_mask); + } } // static |