svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release

Pick up fixes made to 1.18.6 Viewer, including:

* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client

1 files changed, 14 insertions, 8 deletions

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index df446a7239..df939a9c99 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -1,4 +1,4 @@
-/** 
+ /** 
 * @file llcrashlogger.cpp
 * @brief Crash logger implementation
 *
@@ -144,9 +144,18 @@ void LLCrashLogger::gatherFiles()
 	mCrashHost = "https://";
 	mCrashHost += mDebugLog["CurrentSimHost"].asString();
 	mCrashHost += ":12043/crash/report";
-	mAltCrashHost = "https://";
-	mAltCrashHost += mDebugLog["GridUtilHost"].asString();
-	mAltCrashHost += ":12043/crash/report";
+	// Use login servers as the alternate, since they are already load balanced and have a known name
+	// First, check to see if we have a valid grid name. If not, use agni.
+	mAltCrashHost = "https://login.";
+	if(mDebugLog["GridName"].asString() != "")
+	{
+		mAltCrashHost += mDebugLog["GridName"].asString();
+	}
+	else
+	{
+		mAltCrashHost += "agni";
+	}
+	mAltCrashHost += ".lindenlab.com:12043/crash/report";
 
 	mCrashInfo["DebugLog"] = mDebugLog;
 	mFileMap["StatsLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stats.log");
@@ -230,9 +239,6 @@ bool LLCrashLogger::sendCrashLogs()
 		updateApplication("Sending logs...");
 	}
 
-	//util.* servers no longer have a public interface, so there's no alternate server anymore.
-	//leaving this in if we decide we need another alternate server for crash report receiving.
-	/*	
 	if(!gSent)
 	{
 		gBreak = false;
@@ -243,7 +249,7 @@ bool LLCrashLogger::sendCrashLogs()
 			updateApplication("Sending logs to Alternate Server...");
 		}
 	}
-	*/
+	
 
 	mSentCrashLogs = gSent;