SH-4168 WIP, SH-4155 WIP - update inventory model based on ais returns, try to maintain loading... string more consistently in folder bridge

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 27f35c5946..abebd0aa5e 100644..100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1566,18 +1566,18 @@ void LLItemBridge::buildDisplayName() const
 	else
 	{
 		mDisplayName.assign(LLStringUtil::null);
-}
-
+	}
+	
 	mSearchableName.assign(mDisplayName);
 	mSearchableName.append(getLabelSuffix());
 	LLStringUtil::toUpper(mSearchableName);
-
+	
     //Name set, so trigger a sort
     if(mParent)
-{
-        mParent->requestSort();
-	}
+	{
+		mParent->requestSort();
 	}
+}
 
 LLFontGL::StyleFlags LLItemBridge::getLabelStyle() const
 {
@@ -1901,8 +1901,7 @@ void LLFolderBridge::update()
 		possibly_has_children = true;
 	}
 
-	bool loading = (possibly_has_children
-		&& !up_to_date );
+	bool loading = (possibly_has_children && !up_to_date );
 
 	if (loading != mIsLoading)
 	{
@@ -1929,12 +1928,13 @@ void LLFolderBridge::update()
 			||	(LLInventoryModelBackgroundFetch::instance().folderFetchActive()
 				&&	root_is_loading))
 		{
+			buildDisplayName();
 			mDisplayName = LLInvFVBridge::getDisplayName() + " ( " +   LLTrans::getString("LoadingData") + " ) ";
 			mIsLoading = true;
 		}
 		else
 		{
-			mDisplayName = LLInvFVBridge::getDisplayName();
+			buildDisplayName();
 			mIsLoading = false;
 		}
 	}