diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-19 16:15:00 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-19 16:15:00 -0800 |
| commit | 8af432481db885afe215ef51da749543a59f3c6a (patch) | |
| tree | 0ad91072268907c14fb3253bb488eda609ee0d43 /indra/newview/llmarketplacefunctions.cpp | |
| parent | ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a (diff) | |
ACME-3319 : Consolidate Merchant Outboxes when several are present into one in the right place
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
| -rwxr-xr-x | indra/newview/llmarketplacefunctions.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 835615723a..f01a3de16c 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -418,7 +418,10 @@ boost::signals2::connection LLMarketplaceInventoryImporter::setStatusReportCallb void LLMarketplaceInventoryImporter::initialize() { - llassert(!mInitialized); + if (mInitialized) + { + return; + } if (!LLMarketplaceImport::hasSessionCookie()) { |