diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 18:31:06 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 18:31:06 +0200 |
| commit | 258cc9c61aa53c4116930cdc2b9d72b448a24960 (patch) | |
| tree | df9d49de654f76dc2d93fa4fe9024f7cfd80244c /indra/newview/lltoolmgr.cpp | |
| parent | 179f7198904ad9066029e79101068206159e7b55 (diff) | |
| parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) | |
Merge branch 'master' into DRTVWR-482
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) |