1 files changed, 21 insertions, 16 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index f39610f..96d96dc 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -402,13 +402,13 @@ bool handleCrashSubmitBehaviorChanged(const LLSD& newvalue)
         const S32 NEVER_SUBMIT_REPORT = 2;
         if(cb == NEVER_SUBMIT_REPORT)
         {
-                //              LLWatchdog::getInstance()->cleanup(); // SJB: cleaning up a running watchdog is unsafe
+//              LLWatchdog::getInstance()->cleanup(); // SJB: cleaning up a running watchdog thread is unsafe
                 LLAppViewer::instance()->destroyMainloopTimeout();
         }
         else if(gSavedSettings.getBOOL("WatchdogEnabled") == TRUE)
         {
-//              LLWatchdog::getInstance()->init();
-//              LLAppViewer::instance()->initMainloopTimeout("Mainloop Resume");
+                // Don't re-enable the watchdog when we change the setting; this may get called before it's started
+//              LLWatchdog::getInstance()->init();              
         }
         return true;
 }
@@ -1580,6 +1580,7 @@ bool LLAppViewer::initConfiguration()
         // on these platform to help debug.
 #ifndef LL_RELEASE_FOR_DOWNLOAD
         gSavedSettings.setBOOL("WatchdogEnabled", FALSE);
+        gSavedSettings.setBOOL("QAMode", TRUE );
 #endif
 
 #ifndef LL_WINDOWS
@@ -1631,15 +1632,6 @@ bool LLAppViewer::initConfiguration()
         // Do this *before* loading the settings file
         LLAlertDialog::parseAlerts("alerts.xml", &gSavedSettings, TRUE);
 
-#if LL_DYNAMIC_FONT_DISCOVERY
-        // Linux does *dynamic* font discovery which is preferable to
-        // whatever got written-out into the config file last time.  This
-        // does remove the ability of the user to hand-define the fallbacks
-        // though, so from a config-management point of view this is hacky.
-        gSavedSettings.setString("FontSansSerifFallback",
-                                 LLWindow::getFontListSans());
-#endif
-
         // - read command line settings.
         LLControlGroupCLP clp;
         std::string     cmd_line_config = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
@@ -1684,6 +1676,15 @@ bool LLAppViewer::initConfiguration()
         // - load overrides from user_settings 
         loadSettingsFromDirectory(LL_PATH_USER_SETTINGS);
 
+#if LL_DYNAMIC_FONT_DISCOVERY
+        // Linux does *dynamic* font discovery which is preferable to
+        // whatever got written-out into the config file last time.  This
+        // does remove the ability of the user to hand-define the fallbacks
+        // though, so from a config-management point of view this is hacky.
+        gSavedSettings.setString("FontSansSerifFallback",
+                                 LLWindow::getFontListSans());
+#endif
+
         // - apply command line settings 
         clp.notify(); 
 
@@ -2228,7 +2229,11 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB());
         gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated>>10); // MB -> KB
         gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple();
-                
+
+        // The user is not logged on yet, but record the current grid choice login url
+        // which may have been the intended grid. This can b
+        gDebugInfo["GridName"] = LLViewerLogin::getInstance()->getGridLabel();
+
         // *FIX:Mani - move this ddown in llappviewerwin32
 #ifdef LL_WINDOWS
         DWORD thread_id = GetCurrentThreadId();
@@ -2265,9 +2270,6 @@ void LLAppViewer::handleViewerCrash()
 {
         llinfos << "Handle viewer crash entry." << llendl;
 
-        // Make sure the watchdog gets turned off...
-//      LLWatchdog::getInstance()->cleanup(); // SJB: This causes the Watchdog to hang for an extra 20-40s?!
-
         LLAppViewer* pApp = LLAppViewer::instance();
         if (pApp->beingDebugged())
         {
@@ -2283,6 +2285,9 @@ void LLAppViewer::handleViewerCrash()
         }
         pApp->mReportedCrash = TRUE;
 
+        // Make sure the watchdog gets turned off...
+//      pApp->destroyMainloopTimeout(); // SJB: Bah. This causes the crash handler to hang, not sure why.
+        
         //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
         //to check against no matter what
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");