diff -r c6f2f4af65e5 -r 62168c720f96 indra/newview/app_settings/settings.xml
--- a/indra/newview/app_settings/settings.xml	Fri Jul 15 13:20:49 2011 -0400
+++ b/indra/newview/app_settings/settings.xml	Fri Jul 15 17:10:36 2011 -0400
@@ -4872,7 +4872,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string />
+      <string>http://viewer-login.agni.lindenlab.com/</string>
     </map>
     <key>LosslessJ2CUpload</key>
     <map>
diff -r c6f2f4af65e5 -r 62168c720f96 indra/newview/llviewernetwork.cpp
--- a/indra/newview/llviewernetwork.cpp	Fri Jul 15 13:20:49 2011 -0400
+++ b/indra/newview/llviewernetwork.cpp	Fri Jul 15 17:10:36 2011 -0400
@@ -35,7 +35,7 @@
 #include "llweb.h"
 
                                                             
-const char* DEFAULT_LOGIN_PAGE = "http://secondlife.com/app/login/";
+const char* DEFAULT_LOGIN_PAGE = "http://viewer-login.agni.lindenlab.com/";
 
 const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
 const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
diff -r c6f2f4af65e5 -r 62168c720f96 indra/newview/tests/llviewernetwork_test.cpp
--- a/indra/newview/tests/llviewernetwork_test.cpp	Fri Jul 15 13:20:49 2011 -0400
+++ b/indra/newview/tests/llviewernetwork_test.cpp	Fri Jul 15 17:10:36 2011 -0400
@@ -164,7 +164,7 @@
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("Agni login page is correct",
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://viewer-login.agni.lindenlab.com/"));
 		ensure("Agni is a favorite",
 			   grid.has(GRID_IS_FAVORITE_VALUE));
 		ensure("Agni is a system grid", 
@@ -208,7 +208,7 @@
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("Agni login page the same after grid file", 
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://viewer-login.agni.lindenlab.com/"));
 		ensure("Agni still a favorite after grid file", 
 			   grid.has(GRID_IS_FAVORITE_VALUE));
 		ensure("Agni system grid still set after grid file", 
@@ -310,7 +310,7 @@
 					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
 		ensure_equals("Override known grid login uri: login page is not set",
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));		
+					  std::string("http://viewer-login.agni.lindenlab.com/"));		
 		
 		// Override with loginuri
 		// override custom grid
@@ -359,7 +359,7 @@
 					  std::string("https://my.helper.uri/mycustomhelpers"));
 		ensure_equals("Override known grid helper uri: login page is not changed",
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));		
+					  std::string("http://viewer-login.agni.lindenlab.com/"));		
 		
 		// Override with helperuri
 		// override custom grid
@@ -451,9 +451,9 @@
 		ensure_equals("getHelperURI", LLGridManager::getInstance()->getHelperURI(), 
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("getLoginPage", LLGridManager::getInstance()->getLoginPage(), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://viewer-login.agni.lindenlab.com/"));
 		ensure_equals("getLoginPage2", LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://viewer-login.agni.lindenlab.com/"));
 		ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid());		
 		std::vector<std::string> uris;
 		LLGridManager::getInstance()->getLoginURIs(uris);