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

Sync some code in hopes to squish Marketplace wire chewed popups

Browse Source 
A query url will no longer be built in making the request
The status of marketplace will no longer get reset to uninitialized upon
region change.
Merchant status will no longer be requested on regions without the DD cap
This commit is contained in:
Liru Færs
2020-01-16 17:08:01 -05:00
parent 8163448a6c
commit 910a5557ab
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llmarketplacefunctions.cpp
View File

@@ -1265,7 +1265,7 @@ void LLMarketplaceData::initializeSLM(const status_updated_signal_t::slot_type&
}
log_SLM_infos("LLHTTPClient::get", url, LLStringUtil::null);
LLHTTPClient::get(url, LLSD(), new LLSLMGetMerchantResponder);
LLHTTPClient::get(url, new LLSLMGetMerchantResponder);
}
void LLMarketplaceData::setDataFetchedSignal(const status_updated_signal_t::slot_type& cb)

17
indra/newview/llviewermenu.cpp
View File

@@ -600,21 +600,26 @@ void set_merchant_SLM_menu()
gToolBar->getChild<LLView>("marketplace_listings_btn")->setEnabled(true);
}
void check_merchant_status()
void check_merchant_status(bool force)
{
if (!gSavedSettings.getBOOL("InventoryOutboxDisplayBoth"))
{
// Reset the SLM status: we actually want to check again, that's the point of calling check_merchant_status()
LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_NOT_INITIALIZED);
if (force)
{
// Reset the SLM status: we actually want to check again, that's the point of calling check_merchant_status()
LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_NOT_INITIALIZED);
}
// Hide SLM related menu item
gMenuHolder->getChild<LLView>("MarketplaceListings")->setVisible(FALSE);
// Also disable the toolbar button for Marketplace Listings
gToolBar->getChild<LLView>("marketplace_listings_btn")->setEnabled(false);
// Launch an SLM test connection to get the merchant status
LLMarketplaceData::instance().initializeSLM(boost::bind(&set_merchant_SLM_menu));
if (!gAgent.getRegionCapability("DirectDelivery").empty())
{
// Launch an SLM test connection to get the merchant status
LLMarketplaceData::instance().initializeSLM(boost::bind(&set_merchant_SLM_menu));
}
}
}

2
indra/newview/llviewermenu.h
View File

@@ -90,7 +90,7 @@ BOOL enable_god_full(void* user_data);
BOOL enable_god_liaison(void* user_data);
BOOL enable_god_basic(void* user_data);
void set_underclothes_menu_options();
void check_merchant_status();
void check_merchant_status(bool force = false);
void exchange_callingcard(const LLUUID& dest_id);