diff options
author | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
commit | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (patch) | |
tree | fdec4e4cf274e2a916e22d73d11afbce5bb669c0 /indra/newview/llviewernetwork.cpp | |
parent | 6d256d679e9cea63753266420ed79efa8b70dee2 (diff) | |
parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) |
Merge to 5.2.0
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
-rw-r--r-- | indra/newview/llviewernetwork.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 9f6d606a22..46b3c8f315 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -127,7 +127,7 @@ void LLGridManager::initialize(const std::string& grid_file) addSystemGrid(LLTrans::getString("AditiGridLabel"), "util.aditi.lindenlab.com", "https://login.aditi.lindenlab.com/cgi-bin/login.cgi", - "http://aditi-secondlife.webdev.lindenlab.com/helpers/", + "https://secondlife.aditi.lindenlab.com/helpers/", DEFAULT_LOGIN_PAGE, SL_UPDATE_QUERY_URL, "https://my.aditi.lindenlab.com/", |