summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-05-03 13:18:16 -0700
committerMerov Linden <merov@lindenlab.com>2011-05-03 13:18:16 -0700
commit64b192ed6274349a4b8844a9e0165e8b25f3a6ad (patch)
tree02eda71b039d1fa7a205e7ff91504bf0b4a0227d /indra/newview/llpanelmaininventory.cpp
parentd5faa4f38d338777463b7ad6eb3239041d43fe28 (diff)
EXP-756 : Fix inventory folder ordering on launch
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 90617b7dc7..b9a6938492 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -192,6 +192,16 @@ BOOL LLPanelMainInventory::postBuild()
mMenuAdd->getChild<LLMenuItemGL>("Upload Animation")->setLabelArg("[COST]", upload_cost);
mMenuAdd->getChild<LLMenuItemGL>("Bulk Upload")->setLabelArg("[COST]", upload_cost);
+ // EXP-756: Force resorting of the list: in the case of date sorting, one didn't have enough information at
+ // the beginning to correctly sort the folders. Later resort didn't do anything as the order value was
+ // set correctly. The workaround is to reset the order to alphabetical (or anything) then to the correct order.
+ if (mActivePanel)
+ {
+ U32 order = mActivePanel->getSortOrder();
+ mActivePanel->setSortOrder(LLInventoryFilter::SO_NAME);
+ mActivePanel->setSortOrder(order);
+ }
+
return TRUE;
}