merge changes for 3.8.2-release

1 files changed, 9 insertions, 5 deletions

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index e5efca1102..b7b1634a5f 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -160,6 +160,12 @@ BOOL LLFloaterOutbox::postBuild()
 	mCategoryAddedObserver = new LLOutboxAddedObserver(this);
 	gInventory.addObserver(mCategoryAddedObserver);
 	
+    // Setup callbacks for importer
+	LLMarketplaceInventoryImporter& importer = LLMarketplaceInventoryImporter::instance();
+    importer.setInitializationErrorCallback(boost::bind(&LLFloaterOutbox::initializationReportError, this, _1, _2));
+    importer.setStatusChangedCallback(boost::bind(&LLFloaterOutbox::importStatusChanged, this, _1));
+    importer.setStatusReportCallback(boost::bind(&LLFloaterOutbox::importReportResults, this, _1, _2));
+    
 	return TRUE;
 }
 
@@ -298,12 +304,8 @@ void LLFloaterOutbox::initializeMarketPlace()
 	// Initialize the marketplace import API
 	//
 	LLMarketplaceInventoryImporter& importer = LLMarketplaceInventoryImporter::instance();
-	
     if (!importer.isInitialized())
     {
-        importer.setInitializationErrorCallback(boost::bind(&LLFloaterOutbox::initializationReportError, this, _1, _2));
-        importer.setStatusChangedCallback(boost::bind(&LLFloaterOutbox::importStatusChanged, this, _1));
-        importer.setStatusReportCallback(boost::bind(&LLFloaterOutbox::importReportResults, this, _1, _2));
         importer.initialize();
     }
 }
@@ -516,7 +518,7 @@ void LLFloaterOutbox::onImportButtonClicked()
     {
         mOutboxInventoryPanel.get()->clearSelection();
     }
-
+    
 	mImportBusy = LLMarketplaceInventoryImporter::instance().triggerImport();
 }
 
@@ -617,3 +619,5 @@ void LLFloaterOutbox::showNotification(const LLNotificationPtr& notification)
 	notification_handler->processNotification(notification);
 }
 
+
+