diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-06-22 13:35:13 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-06-22 13:35:13 -0700 |
| commit | 0a9f25bcfbc977cf894e83fda95d7ff693039923 (patch) | |
| tree | 9dbf93947bf2d368e74c9847c3996cbad60da55b /indra/newview/llmarketplacefunctions.cpp | |
| parent | c8b662814093fa6ed592fb9cb5118a1401fdc488 (diff) | |
MAINT-6385: Ensure that VMM initialization only happens once after login and that it will only happen after the region caps have been received.
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 6cc7a0fc99..54f95520db 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -773,7 +773,9 @@ void LLMarketplaceData::getMerchantStatusCoro() std::string url = getSLMConnectURL("/merchant"); if (url.empty()) { - LL_INFOS("Marketplace") << "No marketplace capability on Sim" << LL_ENDL; + LL_WARNS("Marketplace") << "No marketplace capability on Sim" << LL_ENDL; + setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE); + return; } LLSD result = httpAdapter->getAndSuspend(httpRequest, url, httpOpts); |