diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-07-23 23:10:43 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-07-24 09:15:48 +0300 |
| commit | 52e693898378c891a03b47a7cb6375718648f6d5 (patch) | |
| tree | aa216b9d151865077052017bca307c8ce9f72b41 /indra/newview/llpanelmaininventory.cpp | |
| parent | 7a82e2619598ae6ed1a291d2f7257de8ea55185d (diff) | |
#6040 Minor startup warnings fixes
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 12 |
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()); |