diff options
Diffstat (limited to 'linden/indra/newview/llviewernetwork.cpp')
-rw-r--r-- | linden/indra/newview/llviewernetwork.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 42cbe46..13d432a 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp | |||
@@ -58,6 +58,10 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] = | |||
58 | "util.aruna.lindenlab.com", | 58 | "util.aruna.lindenlab.com", |
59 | "https://login.aruna.lindenlab.com/cgi-bin/login.cgi", | 59 | "https://login.aruna.lindenlab.com/cgi-bin/login.cgi", |
60 | "http://aruna-secondlife.webdev.lindenlab.com/helpers/" }, | 60 | "http://aruna-secondlife.webdev.lindenlab.com/helpers/" }, |
61 | { "Damballah", | ||
62 | "util.damballah.lindenlab.com", | ||
63 | "https://login.damballah.lindenlab.com/cgi-bin/login.cgi", | ||
64 | "http://damballah-secondlife.webdev.lindenlab.com/helpers/" }, | ||
61 | { "Durga", | 65 | { "Durga", |
62 | "util.durga.lindenlab.com", | 66 | "util.durga.lindenlab.com", |
63 | "https://login.durga.lindenlab.com/cgi-bin/login.cgi", | 67 | "https://login.durga.lindenlab.com/cgi-bin/login.cgi", |
@@ -171,7 +175,7 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name) | |||
171 | int grid_index = GRID_INFO_NONE; | 175 | int grid_index = GRID_INFO_NONE; |
172 | for(;grid_index < GRID_INFO_OTHER; ++grid_index) | 176 | for(;grid_index < GRID_INFO_OTHER; ++grid_index) |
173 | { | 177 | { |
174 | if(0 == LLString::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name.c_str())) | 178 | if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name)) |
175 | { | 179 | { |
176 | // Founding a matching label in the list... | 180 | // Founding a matching label in the list... |
177 | setGridChoice((EGridInfo)grid_index); | 181 | setGridChoice((EGridInfo)grid_index); |
@@ -296,7 +300,7 @@ bool LLViewerLogin::isInProductionGrid() | |||
296 | // but it seems that loginURI trumps that. | 300 | // but it seems that loginURI trumps that. |
297 | std::vector<std::string> uris; | 301 | std::vector<std::string> uris; |
298 | getLoginURIs(uris); | 302 | getLoginURIs(uris); |
299 | LLString::toLower(uris[0]); | 303 | LLStringUtil::toLower(uris[0]); |
300 | if((uris[0].find("agni") != std::string::npos)) | 304 | if((uris[0].find("agni") != std::string::npos)) |
301 | { | 305 | { |
302 | return true; | 306 | return true; |