summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-10-19 21:53:07 -0700
committerMerov Linden <merov@lindenlab.com>2014-10-19 21:53:07 -0700
commitc58af954101ea23f38f7fca6a1d5fd4ed4139e31 (patch)
tree46ebc25c6a0fae5d63a8fcbf1ed282b493a0d97c /indra/newview
parent8ca0ebbb8b3592f146f77e95a8b93ef4d37cf988 (diff)
DD-170 : Set the import callback for Merchant Outbox only when clicking the import button
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloateroutbox.cpp4
-rwxr-xr-xindra/newview/llmarketplacefunctions.cpp12
2 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 772f73867a..0c4b58e501 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -303,7 +303,6 @@ void LLFloaterOutbox::initializeMarketPlace()
{
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,6 +515,9 @@ void LLFloaterOutbox::onImportButtonClicked()
{
mOutboxInventoryPanel.get()->clearSelection();
}
+
+ LLMarketplaceInventoryImporter& importer = LLMarketplaceInventoryImporter::instance();
+ importer.setStatusReportCallback(boost::bind(&LLFloaterOutbox::importReportResults, this, _1, _2));
mImportBusy = LLMarketplaceInventoryImporter::instance().triggerImport();
}
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index fbfddd09a5..b4a2921f8c 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -1030,13 +1030,13 @@ void LLMarketplaceInventoryImporter::updateImport()
}
}
}
-
- // Make sure we trigger the status change with the final state (in case of auto trigger after initialize)
- if (mStatusChangedSignal)
- {
- (*mStatusChangedSignal)(mImportInProgress);
- }
}
+
+ // Make sure we trigger the status change with the final state (in case of auto trigger after initialize)
+ if (mStatusChangedSignal)
+ {
+ (*mStatusChangedSignal)(mImportInProgress);
+ }
}
//