merge

1 files changed, 6 insertions, 5 deletions

diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 8f56d81232..87bbe76320 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -33,6 +33,7 @@
 #include "llviewerfoldertype.h"
 #include "llinventorybridge.h"	// for LLItemBridge in LLInventorySort::operator()
 #include "llinventoryfilter.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
 #include "llpanel.h"
 #include "llviewercontrol.h"	// gSavedSettings
@@ -1902,9 +1903,9 @@ void LLFolderViewFolder::sortBy(U32 order)
 		folders_t::iterator fit = iter++;
 		(*fit)->sortBy(order);
 	}
-	

-	// Don't sort the topmost folders (My Inventory and Library)

-	if (mListener->getUUID().notNull())

+
+	// Don't sort the topmost folders (My Inventory and Library)
+	if (mListener->getUUID().notNull())
 	{
 		mFolders.sort(mSortFunction);
 		mItems.sort(mSortFunction);
@@ -2046,7 +2047,7 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
 	requestArrange();
 	requestSort();
 	LLFolderViewFolder* parentp = getParentFolder();
-	while (parentp && !parentp->getCreationDate())
+	while (parentp && parentp->mSortFunction.isByDate())
 	{
 		// parent folder doesn't have a time stamp yet, so get it from us
 		parentp->requestSort();
@@ -2072,7 +2073,7 @@ BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
 	folder->requestArrange(TRUE);
 	requestSort();
 	LLFolderViewFolder* parentp = getParentFolder();
-	while (parentp && !parentp->getCreationDate())
+	while (parentp && !parentp->mSortFunction.isByDate())
 	{
 		// parent folder doesn't have a time stamp yet, so get it from us
 		parentp->requestSort();