diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-04 14:33:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-04 14:33:25 -0800 |
| commit | 88cf648176f9ce8214516f4d81d8d1cd55cede2f (patch) | |
| tree | 9aac41a6c360fe826aaef02cbfd284e06f9b5770 /indra/newview/llpanelmaininventory.cpp | |
| parent | 34c8f6f7fa728c139a0da0deaccf6fda3d228680 (diff) | |
| parent | 14579a1ccab2817b019a61ffe1ac6b5edc3eb146 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 50cfc7d177..421c9df9a1 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -117,7 +117,7 @@ LLPanelMainInventory::LLPanelMainInventory() // Controls // *TODO: Just use persistant settings for each of these - U32 sort_order = gSavedSettings.getU32("InventorySortOrder"); + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER); BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE ); BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME ); BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP ); @@ -145,7 +145,7 @@ BOOL LLPanelMainInventory::postBuild() if (mActivePanel) { // "All Items" is the previous only view, so it gets the InventorySortOrder - mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder")); + mActivePanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER)); mActivePanel->getFilter()->markDefault(); mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState); mActivePanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mActivePanel, _1, _2)); |