diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-12 21:58:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-12 21:58:52 -0400 |
| commit | d500379cea865e4a6958eee82b5615ace61036c4 (patch) | |
| tree | e1646aa036beae68d5d15371d7ea2731ad49602c /indra/newview/llmarketplacefunctions.cpp | |
| parent | ce563795e1f5d7493b975393bea9ec5cab90fd6a (diff) | |
PATH-735: Limit and clean up grid selection
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 93dd82957f..1e1243c78a 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -47,16 +47,16 @@ static std::string getMarketplaceDomain() if (!LLGridManager::getInstance()->isInProductionGrid()) { - const std::string& grid_label = LLGridManager::getInstance()->getGridLabel(); - const std::string& grid_label_lower = utf8str_tolower(grid_label); + const std::string& grid_id = LLGridManager::getInstance()->getGridId(); + const std::string& grid_id_lower = utf8str_tolower(grid_id); - if (grid_label_lower == "damballah") + if (grid_id_lower == "damballah") { domain = "secondlife-staging.com"; } else { - domain = llformat("%s.lindenlab.com", grid_label_lower.c_str()); + domain = llformat("%s.lindenlab.com", grid_id_lower.c_str()); } } |