diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 22:00:41 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 22:00:41 +0300 |
| commit | c3bd256f3340e9223b8855368648f3925760c0b4 (patch) | |
| tree | 072244e740dffe530b4bd9c7e41c3074ac337402 /indra/newview/lltoolmgr.cpp | |
| parent | f636b48109e3234ce8a5c36502c7f2615c253bb1 (diff) | |
| parent | 894725f3314d24c20414a9a2491cf0cd59882788 (diff) | |
Upstream merge from viewer-neko
Diffstat (limited to 'indra/newview/lltoolmgr.cpp')
| -rw-r--r-- | indra/newview/lltoolmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index f6eb290bc3..3fcf193dec 100644 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -355,7 +355,7 @@ bool LLToolMgr::inBuildMode() bool LLToolMgr::canAccessMarketplace() { - return (LLMarketplaceData::instance().getSLMStatus() != MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT) || gSavedSettings.getBOOL("InventoryOutboxDisplayBoth"); + return (LLMarketplaceData::instance().getSLMStatus() != MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT); } void LLToolMgr::toggleMarketplace(const LLSD& sdname) |