From af32a74b77ffc2110de821e0159de8eb5aa0f454 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 5 Jan 2012 16:30:15 -0800
Subject: EXP-1757 FIX -- Merchant Outbox shows as empty when first
 opening/initializing even when populated

* Updated merchant outbox floater to not wait for initialization to complete before displaying outbox inventory contents.
---
 indra/newview/llfloateroutbox.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llfloateroutbox.cpp')

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 8ccebb36dc..6ecf715588 100644
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -280,6 +280,14 @@ void LLFloaterOutbox::updateFolderCount()
 	
 	mOutboxItemCount = item_count;
 
+	if (!mImportBusy)
+	{
+		updateFolderCountStatus();
+	}
+}
+
+void LLFloaterOutbox::updateFolderCountStatus()
+{
 	if (mOutboxInventoryPanel)
 	{
 		switch (mOutboxItemCount)
@@ -304,10 +312,7 @@ void LLFloaterOutbox::updateFolderCount()
 
 void LLFloaterOutbox::updateView()
 {
-	if (!mImportBusy)
-	{
-		updateFolderCount();
-	}
+	updateFolderCount();
 
 	if (mOutboxItemCount > 0)
 	{
-- 
cgit v1.2.3