4 files changed, 26 insertions, 10 deletions

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 622c9edba7..54fdee6901 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -257,6 +257,8 @@ LLFolderView::LLFolderView(const Params& p)
 	mPopupMenuHandle = menu->getHandle();
 
 	mViewModelItem->openItem();
+
+	mAreChildrenInited = true; // root folder is a special case due to not being loaded normally, assume that it's inited.
 }
 
 // Destroys the object
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 285bf9f484..eba93beed9 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -132,7 +132,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 	mCutGeneration(0),
 	mLabelStyle( LLFontGL::NORMAL ),
 	mHasVisibleChildren(FALSE),
-	mIsFolderComplete(true),
     mLocalIndentation(p.folder_indentation),
 	mIndentation(0),
 	mItemHeight(p.item_height),
@@ -1003,11 +1002,11 @@ LLFolderViewFolder::LLFolderViewFolder( const LLFolderViewItem::Params& p ):
 	mCurHeight(0.f),
 	mTargetHeight(0.f),
 	mAutoOpenCountdown(0.f),
+	mIsFolderComplete(false), // folder might have children that are not loaded yet.
+	mAreChildrenInited(false), // folder might have children that are not built yet.
 	mLastArrangeGeneration( -1 ),
 	mLastCalculatedWidth(0)
 {
-	// folder might have children that are not loaded yet. Mark it as incomplete until chance to check it.
-	mIsFolderComplete = false;
 }
 
 void LLFolderViewFolder::updateLabelRotation()
@@ -1063,13 +1062,16 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 {
 	// Sort before laying out contents
     // Note that we sort from the root (CHUI-849)
-	getRoot()->getFolderViewModel()->sort(this);
+    if (mAreChildrenInited)
+    {
+        getRoot()->getFolderViewModel()->sort(this);
+    }
 
 	LL_RECORD_BLOCK_TIME(FTM_ARRANGE);
 	
 	// evaluate mHasVisibleChildren
 	mHasVisibleChildren = false;
-	if (getViewModelItem()->descendantsPassedFilter())
+	if (mAreChildrenInited && getViewModelItem()->descendantsPassedFilter())
 	{
 		// We have to verify that there's at least one child that's not filtered out
 		bool found = false;
@@ -1095,7 +1097,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 
 		mHasVisibleChildren = found;
 	}
-	if (!mIsFolderComplete)
+	if (!mIsFolderComplete && mAreChildrenInited)
 	{
 		mIsFolderComplete = getFolderViewModel()->isFolderComplete(this);
 	}
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index 616d2e7d86..ee20d048fd 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -116,7 +116,6 @@ protected:
 	F32							mControlLabelRotation;
 	LLFolderView*				mRoot;
 	bool						mHasVisibleChildren,
-								mIsFolderComplete, // indicates that some children were not loaded/added yet
 								mIsCurSelection,
 								mDragAndDropTarget,
 								mIsMouseOverTitle,
@@ -219,7 +218,10 @@ public:
 	BOOL hasVisibleChildren() { return mHasVisibleChildren; }
 
 	// true if object can't have children
-	BOOL isFolderComplete() { return mIsFolderComplete; }
+	virtual bool isFolderComplete() { return true; }
+    // true if object can't have children
+    virtual bool areChildrenInited() { return true; }
+    virtual void setChildrenInited(bool inited) { }
 
 	// Call through to the viewed object and return true if it can be
 	// removed. Returns true if it's removed.
@@ -334,6 +336,8 @@ protected:
 	S32			mLastArrangeGeneration;
 	S32			mLastCalculatedWidth;
 	bool		mNeedsSort;
+	bool		mIsFolderComplete; // indicates that some children were not loaded/added yet
+	bool		mAreChildrenInited; // indicates that no children were initialized
 
 public:
 	typedef enum e_recurse_type
@@ -385,6 +389,13 @@ public:
 	// destroys this folder, and all children
 	virtual void destroyView();
 
+    // whether known children are fully loaded (arrange sets to true)
+    virtual bool isFolderComplete() { return mIsFolderComplete; }
+
+    // whether known children are fully built
+    virtual bool areChildrenInited() { return mAreChildrenInited; }
+    virtual void setChildrenInited(bool inited) { mAreChildrenInited = inited; }
+
 	// extractItem() removes the specified item from the folder, but
 	// doesn't delete it.
 	virtual void extractItem( LLFolderViewItem* item, bool deparent_model = true);
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 550b13221d..cd87c44dc2 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -346,8 +346,7 @@ LLScrollListCtrl::~LLScrollListCtrl()
 
 	std::for_each(mItemList.begin(), mItemList.end(), DeletePointer());
 	mItemList.clear();
-	std::for_each(mColumns.begin(), mColumns.end(), DeletePairedPointer());
-	mColumns.clear();
+    clearColumns(); //clears columns and deletes headers
 	delete mIsFriendSignal;
 }
 
@@ -3021,6 +3020,8 @@ void LLScrollListCtrl::clearColumns()
 	mSortColumns.clear();
 	mTotalStaticColumnWidth = 0;
 	mTotalColumnPadding = 0;
+
+    dirtyColumns(); // Clears mColumnsIndexed
 }
 
 void LLScrollListCtrl::setColumnLabel(const std::string& column, const std::string& label)