Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Should've removed this with the rest of Outbox

Browse Source
This commit is contained in:
Lirusaito
2019-03-04 14:57:51 -05:00
parent 4008cf519c
commit 99703b1121
1 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llviewermenu.cpp
View File

@@ -593,28 +593,8 @@ void set_merchant_SLM_menu()
// DD-170 : SLM Alpha and Beta program : for the moment, we always show the SLM menu and // DD-170 : SLM Alpha and Beta program : for the moment, we always show the SLM menu and
// tools so that all merchants can try out the UI, even if not migrated. // tools so that all merchants can try out the UI, even if not migrated.
// *TODO : Keep SLM UI hidden for non migrated merchant in released viewer // *TODO : Keep SLM UI hidden for non migrated merchant in released viewer
gMenuHolder->getChild<LLView>("MarketplaceListings")->setVisible(TRUE);
//if (LLMarketplaceData::instance().getSLMStatus() == MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT) gToolBar->getChild<LLView>("marketplace_listings_btn")->setEnabled(false);
//{
// Merchant not migrated: show only the old Merchant Outbox menu
// gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(TRUE);
//}
//else
//{
// All other cases (new merchant, not merchant, migrated merchant): show the new Marketplace Listings menu and enable the tool
gMenuHolder->getChild<LLView>("MarketplaceListings")->setVisible(TRUE);
gToolBar->getChild<LLView>("marketplace_listings_btn")->setEnabled(false);
//}
}
void set_merchant_outbox_menu(U32 status, const LLSD& content)
{
// If the merchant is fully migrated, the API is disabled (503) and we won't show the old menu item.
// In all other cases, we show it.
if (status != MarketplaceErrorCodes::IMPORT_SERVER_API_DISABLED)
{
gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(TRUE);
}
} }
void check_merchant_status() void check_merchant_status()
@@ -632,17 +612,6 @@ void check_merchant_status()
// Launch an SLM test connection to get the merchant status // Launch an SLM test connection to get the merchant status
LLMarketplaceData::instance().initializeSLM(boost::bind(&set_merchant_SLM_menu)); LLMarketplaceData::instance().initializeSLM(boost::bind(&set_merchant_SLM_menu));
// Do the Merchant Outbox init only once per session
if (LLMarketplaceInventoryImporter::instance().getMarketPlaceStatus() == MarketplaceStatusCodes::MARKET_PLACE_NOT_INITIALIZED)
{
// Hide merchant outbox related menu item
gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(FALSE);
// Launch a Merchant Outbox test connection to get the migration status
LLMarketplaceInventoryImporter::instance().setStatusReportCallback(boost::bind(&set_merchant_outbox_menu, _1, _2));
LLMarketplaceInventoryImporter::instance().initialize();
}
} }
} }