diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 14:41:26 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 14:41:26 -0800 |
| commit | c24645f7b51ea27e1686bbe72470a9f3c09fc676 (patch) | |
| tree | 4f4a77ff8f11e7cc0a0f7af437b8699f0d035727 /indra | |
| parent | 9740887b90791b3fad37e58ab9e2ac772e8d2e95 (diff) | |
Updated url for damballah to use secondlife-staging
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 599731a641..99b0389413 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -38,8 +38,16 @@ std::string getMarketplaceBaseURL() if (!LLGridManager::getInstance()->isInProductionGrid()) { - std::string gridLabel = LLGridManager::getInstance()->getGridLabel(); - url = llformat("https://marketplace.%s.lindenlab.com/", utf8str_tolower(gridLabel).c_str()); + std::string gridLabel = utf8str_tolower(LLGridManager::getInstance()->getGridLabel()); + + if (gridLabel == "damballah") + { + url = "https://marketplace.secondlife-staging.com/"; + } + else + { + url = llformat("https://marketplace.%s.lindenlab.com/", gridLabel.c_str()); + } } url += "api/1/users/"; @@ -67,7 +75,7 @@ std::string getMarketplaceURL_UserStatus() } -static bool gMarketplaceSyncEnabled = false; +static bool gMarketplaceSyncEnabled = true; bool getMarketplaceSyncEnabled() { |