livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-5296 : Inventory folders revert to defort "sort" with each login 

Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code.  Makes this sorting code a lot easier to debug.
master
Loren Shih 2010-03-04 15:29:49 -05:00
parent 982aec721f
commit 2a60fdb197
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llinventorymodel.cpp
View File

@ -1542,7 +1542,7 @@ void LLInventoryModel::bulkFetch(std::string url)
U32 folder_count=0;
U32 max_batch_size=5;
U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1;
LLSD body;
LLSD body_lib;

21
indra/newview/llinventorypanel.h
View File

@ -65,10 +65,6 @@ class LLInventoryPanel : public LLPanel
// Data
//--------------------------------------------------------------------
public:
static const std::string DEFAULT_SORT_ORDER;
static const std::string RECENTITEMS_SORT_ORDER;
static const std::string INHERIT_SORT_ORDER;
struct Filter : public LLInitParam::Block<Filter>
{
Optional<U32> sort_order;
@ -142,8 +138,6 @@ public:
U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
void setFilterSubString(const std::string& string);
const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
void setSortOrder(U32 order);
U32 getSortOrder() { return mFolders->getSortOrder(); }
void setSinceLogoff(BOOL sl);
void setHoursAgo(U32 hours);
BOOL getSinceLogoff();
@ -182,7 +176,6 @@ protected:
LLInventoryModel* mInventory;
LLInventoryObserver* mInventoryObserver;
BOOL mAllowMultiSelect;
std::string mSortOrderSetting;
LLFolderView* mFolders;
LLScrollContainer* mScroller;
@ -196,6 +189,20 @@ protected:
*/
const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder;
//--------------------------------------------------------------------
// Sorting
//--------------------------------------------------------------------
public:
static const std::string DEFAULT_SORT_ORDER;
static const std::string RECENTITEMS_SORT_ORDER;
static const std::string INHERIT_SORT_ORDER;
void setSortOrder(U32 order);
U32 getSortOrder() const { return mFolders->getSortOrder(); }
private:
std::string mSortOrderSetting;
//--------------------------------------------------------------------
// Hidden folders
//--------------------------------------------------------------------

4
indra/newview/llpanelmaininventory.cpp
View File

@ -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));

3
indra/newview/llviewerinventory.cpp
View File

@ -48,6 +48,7 @@
#include "llsidetray.h"
#include "llinventorybridge.h"
#include "llinventorypanel.h"
#include "llfloaterinventory.h"
#include "llviewerassettype.h"
@ -525,7 +526,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
// 2 = folders by date
// Need to mask off anything but the first bit.
// This comes from LLInventoryFilter from llfolderview.h
U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1;
// *NOTE: For bug EXT-2879, originally commented out
// gAgent.getRegion()->getCapability in order to use the old