svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6

1 files changed, 25 insertions, 40 deletions

diff --git a/indra/win_crash_logger/win_crash_logger.rc b/indra/win_crash_logger/win_crash_logger.rc
index 2c46859b95..2819722f63 100644
--- a/indra/win_crash_logger/win_crash_logger.rc
+++ b/indra/win_crash_logger/win_crash_logger.rc
@@ -56,13 +56,13 @@ END
 // Dialog
 //
 
-IDD_PROGRESS DIALOG  100, 100, 186, 33
+IDD_PROGRESS DIALOGEX 100, 100, 234, 33
 STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CAPTION | WS_SYSMENU
 CAPTION "%s Crash Logger"
 CLASS "WIN_CRASH_LOGGER"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    LTEXT           "Static",IDC_LOG,7,7,172,8
+    LTEXT           "Static",IDC_LOG,7,7,220,8
 END
 
 IDD_REPORT DIALOGEX 100, 100, 297, 125
@@ -73,48 +73,33 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Send",IDOK,198,104,45,15,WS_GROUP
     PUSHBUTTON      "Don't Send",IDCANCEL,247,104,45,15,WS_GROUP
-    LTEXT           "%s appears to have crashed.",IDC_STATIC_HEADER,4,4,288,
-                    14
-    LTEXT           "This crash reporter collects information about your computer's hardware, operating system, and some %s logs, which are used for debugging purposes only.",
-                    IDC_STATIC_WHATINFO,4,23,288,19,NOT WS_GROUP
-    CONTROL         "Remember this choice",IDC_CHECK_AUTO,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,106,89,13
-    LTEXT           "Sending crash reports is the best way to help us improve the quality of %s.",
-                    IDC_STATIC_MOTIVATION,4,38,288,8
-    LTEXT           "If you continue to experience this problem, please try:",
-                    IDC_STATIC,4,57,251,8
-    LTEXT           "- Contacting support by visiting http://www.secondlife.com/support",
-                    IDC_STATIC,4,67,231,8
+    LTEXT           "%s appears to have crashed.",IDC_STATIC_HEADER,4,4,288,14
+    LTEXT           "This crash reporter collects information about your computer's hardware, operating system, and some %s logs, which are used for debugging purposes only.",IDC_STATIC_WHATINFO,4,23,288,19,NOT WS_GROUP
+    CONTROL         "Remember this choice",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,106,89,13
+    LTEXT           "Sending crash reports is the best way to help us improve the quality of %s.",IDC_STATIC_MOTIVATION,4,43,288,8
+    LTEXT           "If you continue to experience this problem, please try:",IDC_STATIC,4,57,251,8
+    LTEXT           "- Contacting support by visiting http://www.secondlife.com/support",IDC_STATIC,4,67,231,8
 END
 
-IDD_PREVREPORTBOX DIALOG  100, 100, 232, 213
+IDD_PREVREPORTBOX DIALOGEX 100, 100, 232, 213
 STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CAPTION | WS_SYSMENU
 CAPTION "%s Crash Logger"
 CLASS "WIN_CRASH_LOGGER"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,131,193,45,15,WS_GROUP
-    EDITTEXT        IDC_EDIT1,4,102,223,89,ES_MULTILINE | ES_WANTRETURN | 
-                    WS_VSCROLL
-    PUSHBUTTON      "Cancel",IDCANCEL,181,193,45,15,WS_GROUP
-    LTEXT           "%s appears to have crashed or frozen the last time it ran.",
-                    IDC_STATIC,4,4,214,8
-    LTEXT           "This crash reporter collects information about your computer's",
-                    IDC_STATIC,4,17,201,8
-    LTEXT           "hardware configuration, operating system, and some %s",
-                    IDC_STATIC,4,25,212,8
-    LTEXT           "logs, all of which are used for debugging purposes only.",
-                    IDC_STATIC,4,33,210,8
-    LTEXT           "In the space below, please briefly describe what you were doing",
-                    IDC_STATIC,3,48,208,8
-    LTEXT           "or trying to do just prior to the crash.",IDC_STATIC,3,
-                    56,204,8
-    LTEXT           "If you don't wish to send Linden Lab a crash report, press Cancel.",
-                    IDC_STATIC,3,90,214,8
-    LTEXT           "This report is NOT read by customer support.  If you have billing or",
-                    IDC_STATIC,3,68,208,8
-    LTEXT           "other questions, please go to: www.secondlife.com/support",
-                    IDC_STATIC,3,76,206,8
+    DEFPUSHBUTTON   "Send Report",IDOK,131,193,45,15,WS_GROUP
+    EDITTEXT        IDC_EDIT1,3,100,223,89,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
+    PUSHBUTTON      "Don't Send",IDCANCEL,181,193,45,15,WS_GROUP
+    LTEXT           "%s appears to have crashed or frozen the last time it ran.",IDC_STATIC_HEADER,4,4,214,8
+    LTEXT           "This crash reporter collects information about your computer's",IDC_STATIC,4,17,201,8
+    LTEXT           "hardware configuration, operating system, and some %s",IDC_STATIC_MSG,4,25,212,8
+    LTEXT           "logs, all of which are used for debugging purposes only.",IDC_STATIC,4,33,210,8
+    LTEXT           "In the space below, please briefly describe what you were doing",IDC_STATIC,3,48,208,8
+    LTEXT           "or trying to do just prior to the crash.",IDC_STATIC,3,56,204,8
+    LTEXT           "If you don't wish to send Linden Lab a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
+    LTEXT           "This report is NOT read by customer support.  If you have billing or",IDC_STATIC,3,68,208,8
+    LTEXT           "other questions, please go to: www.secondlife.com/support",IDC_STATIC,3,76,206,8
+    CONTROL         "Remember this choice",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,193,89,13
 END
 
 
@@ -158,7 +143,7 @@ BEGIN
     IDD_PROGRESS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 179
+        RIGHTMARGIN, 227
         TOPMARGIN, 7
         BOTTOMMARGIN, 26
     END