diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-10-06 21:09:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-10-06 21:09:01 -0700 |
| commit | 5ded6ef85b971a2be9287f11be5acca2b343f364 (patch) | |
| tree | ae259a584f4e8a925fa47c4599845c68f426182c /indra | |
| parent | 6b8916e7604d47f37d30ae0c1a6ab2465da1f39d (diff) | |
DD-170 : Rename enum for consistency
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llmarketplacefunctions.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llmarketplacefunctions.h | 2 | ||||
| -rwxr-xr-x | indra/newview/lltoolmgr.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 58a946e4e4..8988b80a4f 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -156,7 +156,7 @@ protected: else if (HTTP_SERVICE_UNAVAILABLE == getStatus()) { log_SLM_infos("Get /merchant", getStatus(), "Merchant is not migrated"); - LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_MERCHANT_NOT_MIGRATED); + LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT); } else { diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h index ae58f5fc3c..f5b84fcdc3 100755 --- a/indra/newview/llmarketplacefunctions.h +++ b/indra/newview/llmarketplacefunctions.h @@ -68,7 +68,7 @@ namespace MarketplaceStatusCodes MARKET_PLACE_CONNECTION_FAILURE = 2, MARKET_PLACE_MERCHANT = 3, MARKET_PLACE_NOT_MERCHANT = 4, - MARKET_MERCHANT_NOT_MIGRATED = 5 + MARKET_PLACE_NOT_MIGRATED_MERCHANT = 5 }; } diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index f040a28837..3ecb4015ce 100755 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -350,7 +350,7 @@ bool LLToolMgr::inBuildMode() bool LLToolMgr::canAccessMarketplace() { - return (LLMarketplaceData::instance().getSLMStatus() != MarketplaceStatusCodes::MARKET_MERCHANT_NOT_MIGRATED) || gSavedSettings.getBOOL("InventoryOutboxDisplayBoth"); + return (LLMarketplaceData::instance().getSLMStatus() != MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT) || gSavedSettings.getBOOL("InventoryOutboxDisplayBoth"); } void LLToolMgr::toggleMarketplace(const LLSD& sdname) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 613ad00809..b5262a7e1b 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -390,7 +390,7 @@ void set_underclothes_menu_options() void set_merchant_menu() { - if (LLMarketplaceData::instance().getSLMStatus() == MarketplaceStatusCodes::MARKET_MERCHANT_NOT_MIGRATED) + if (LLMarketplaceData::instance().getSLMStatus() == MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT) { // Merchant not migrated: show only the old Merchant Outbox menu gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(TRUE); |