Merge viewer-release

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 3dd327591e..d1dddf8e7e 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -236,7 +236,7 @@ namespace tut
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("Agni login page",
 					  LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
-					  std::string("http://viewer-login.agni.lindenlab.com/"));
+					  std::string("https://viewer-splash.secondlife.com/"));
 		ensure("Agni is a system grid",
 			   LLGridManager::getInstance()->isSystemGrid("util.agni.lindenlab.com"));
 
@@ -261,7 +261,7 @@ namespace tut
 					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
 		ensure_equals("Aditi login page",
 					  LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
-					  std::string("http://viewer-login.agni.lindenlab.com/"));
+					  std::string("https://viewer-splash.secondlife.com/"));
 		ensure("Aditi is a system grid",
 			   LLGridManager::getInstance()->isSystemGrid("util.aditi.lindenlab.com"));
 	}
@@ -309,7 +309,7 @@ namespace tut
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("Agni login page",
 					  LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"),
-					  std::string("http://viewer-login.agni.lindenlab.com/"));
+					  std::string("https://viewer-splash.secondlife.com/"));
 		ensure("Agni is a system grid",
 			   LLGridManager::getInstance()->isSystemGrid("util.agni.lindenlab.com"));
 
@@ -333,7 +333,7 @@ namespace tut
 					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
 		ensure_equals("Aditi login page",
 					  LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
-					  std::string("http://viewer-login.agni.lindenlab.com/"));
+					  std::string("https://viewer-splash.secondlife.com/"));
 		ensure("Aditi is a system grid",
 			   LLGridManager::getInstance()->isSystemGrid("util.aditi.lindenlab.com"));
 
@@ -422,7 +422,7 @@ namespace tut
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("getLoginPage",
 					  LLGridManager::getInstance()->getLoginPage(),
-					  std::string("http://viewer-login.agni.lindenlab.com/"));
+					  std::string("https://viewer-splash.secondlife.com/"));
 		ensure_equals("update url base for Agni", // relies on agni being the default
 					  std::string("https://update.secondlife.com/update"),
 					  LLGridManager::getInstance()->getUpdateServiceURL());