diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
| commit | 96bb17f20bbcdc595f3a615a3129e134595b3a4a (patch) | |
| tree | e51e47f79b78a076e821360763196cc72c154aad /indra/newview/llviewernetwork.cpp | |
| parent | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rwxr-xr-x | indra/newview/llviewernetwork.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index faa58d423f..6666aecca2 100755 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -119,14 +119,14 @@ void LLGridManager::initialize(const std::string& grid_file) mGridFile = grid_file; // as we don't want an attacker to override our grid list // to point the default grid to an invalid grid - addSystemGrid("Second Life Main Grid (Agni)", + addSystemGrid(LLTrans::getString("AgniGridLabel"), MAINGRID, MAIN_GRID_LOGIN_URI, "https://secondlife.com/helpers/", DEFAULT_LOGIN_PAGE, SL_UPDATE_QUERY_URL, "Agni"); - addSystemGrid("Second Life Beta Test Grid (Aditi)", + addSystemGrid(LLTrans::getString("AditiGridLabel"), "util.aditi.lindenlab.com", "https://login.aditi.lindenlab.com/cgi-bin/login.cgi", "http://aditi-secondlife.webdev.lindenlab.com/helpers/", |