Second Life viewer sources 1.22.0-RC

2 files changed, 2 insertions, 49 deletions

diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index 03f2394..89581f1 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -322,7 +322,7 @@ bool LLCrashLoggerWindows::mainLoop()
         {
                 gHwndReport = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PREVREPORTBOX), 0, NULL);
                 // Ignore result
-                (void) SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 1, 0);
+                (void) SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 0, 0);
                 // Include the product name in the caption and various dialog items.
                 ProcessCaption(gHwndReport);
                 ProcessDlgItemText(gHwndReport, IDC_STATIC_MSG);
diff --git a/linden/indra/win_crash_logger/win_crash_logger.cpp b/linden/indra/win_crash_logger/win_crash_logger.cpp
index 773aa68..3056094 100644
--- a/linden/indra/win_crash_logger/win_crash_logger.cpp
+++ b/linden/indra/win_crash_logger/win_crash_logger.cpp
@@ -54,56 +54,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 {
         llinfos << "Starting crash reporter" << llendl;
 
-        // In Win32, we need to generate argc and argv ourselves...
-        // Note: GetCommandLine() returns a  potentially return a LPTSTR
-        // which can resolve to a LPWSTR (unicode string).
-        // (That's why it's different from lpCmdLine which is a LPSTR.)
-        // We don't currently do unicode, so call the non-unicode version
-        // directly.
-        llinfos << "Processing command line" << llendl;
-        LPSTR cmd_line_including_exe_name = GetCommandLineA();
-
-        const S32       MAX_ARGS = 100;
-        int argc = 0;
-        char *argv[MAX_ARGS];           
-
-        char *token = NULL;
-        if( cmd_line_including_exe_name[0] == '\"' )
-        {
-                // Exe name is enclosed in quotes
-                token = strtok( cmd_line_including_exe_name, "\"" );
-                argv[argc++] = token;
-                token = strtok( NULL, " \t," );
-        }
-        else
-        {
-                // Exe name is not enclosed in quotes
-                token = strtok( cmd_line_including_exe_name, " \t," );
-        }
-
-        while( (token != NULL) && (argc < MAX_ARGS) )
-        {
-                argv[argc++] = token;
-                /* Get next token: */
-                if (*(token + strlen(token) + 1) == '\"')               
-                {
-                        token = strtok( NULL, "\"");
-                }
-                else
-                {
-                        token = strtok( NULL, " \t," );
-                }
-        }
-
         LLCrashLoggerWindows app;
-        bool ok = app.parseCommandOptions(argc, argv);
-        if(!ok)
-        {
-                llwarns << "Unable to parse command line." << llendl;
-        }
-        
         app.setHandle(hInstance);
-        ok = app.init();
+        bool ok = app.init();
         if(!ok)
         {
                 llwarns << "Unable to initialize application." << llendl;