summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-07-06 15:48:33 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-07-06 15:48:33 -0700
commit60f6d809262d97de3b41dcf18a43d783b4b485dc (patch)
tree3bcf4407c49f68c261fa85e295424c1109b4f8e6 /indra/newview/llfolderviewitem.cpp
parent752cf885f1a115c5f82dbba111e3a7e4d8cf1f40 (diff)
EXP-980 Inbox sorting does not persist between sessions
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r--indra/newview/llfolderviewitem.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index b76e8395fb..8f56d81232 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -1902,9 +1902,13 @@ void LLFolderViewFolder::sortBy(U32 order)
folders_t::iterator fit = iter++;
(*fit)->sortBy(order);
}
-
- mFolders.sort(mSortFunction);
- mItems.sort(mSortFunction);
+
+ // Don't sort the topmost folders (My Inventory and Library)
+ if (mListener->getUUID().notNull())
+ {
+ mFolders.sort(mSortFunction);
+ mItems.sort(mSortFunction);
+ }
if (order & LLInventoryFilter::SO_DATE)
{