livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DD-170 : Rename enum for consistency

meow-7.2.2
Merov Linden 2014-10-06 21:09:01 -07:00
parent 6b8916e760
commit 5ded6ef85b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llmarketplacefunctions.cpp
View File

@ -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
{

2
indra/newview/llmarketplacefunctions.h
View File

@ -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
};
}

2
indra/newview/lltoolmgr.cpp
View File

@ -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)

2
indra/newview/llviewermenu.cpp
View File

@ -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);