From fb793870fe95f1951d7c30ea6068e187b9dededd Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Tue, 23 Dec 2008 19:39:58 +0000 Subject: QAR-1142 merging 1.22 RC0-RC4 changes. svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge --- indra/mac_crash_logger/CrashReporter.nib/info.nib | 8 ++- .../mac_crash_logger/CrashReporter.nib/objects.xib | 59 +++++++++++----------- 2 files changed, 32 insertions(+), 35 deletions(-) (limited to 'indra/mac_crash_logger') diff --git a/indra/mac_crash_logger/CrashReporter.nib/info.nib b/indra/mac_crash_logger/CrashReporter.nib/info.nib index b5417442d0..06805c0e4f 100644 --- a/indra/mac_crash_logger/CrashReporter.nib/info.nib +++ b/indra/mac_crash_logger/CrashReporter.nib/info.nib @@ -5,15 +5,13 @@ IBFramework Version 629 IBLastKnownRelativeProjectPath - ../macview.xcodeproj + ../../build-darwin-i386/SecondLife.xcodeproj IBOldestOS 5 IBOpenObjects - - 193 - + IBSystem Version - 9B18 + 9E17 targetFramework IBCarbonFramework diff --git a/indra/mac_crash_logger/CrashReporter.nib/objects.xib b/indra/mac_crash_logger/CrashReporter.nib/objects.xib index 1099f561e7..634d1c5321 100644 --- a/indra/mac_crash_logger/CrashReporter.nib/objects.xib +++ b/indra/mac_crash_logger/CrashReporter.nib/objects.xib @@ -3,9 +3,10 @@ - - Second Life appears to have crashed or frozen the last time it ran. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. - 20 20 231 487 + + ok + Send Report + 414 273 434 378 not! @@ -13,49 +14,47 @@ Don't Send 414 390 434 487 - - - - - ok - Send Report - 414 273 434 378 - - - - text - TRUE - 242 23 391 484 - - - remb - 1 - Remember This Choice - 415 20 433 186 - - - 0 0 454 507 + + Second Life appears to have crashed or frozen the last time it ran. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. + 20 20 231 487 2 3 7 Second Life Crash Logger - + + + + + + + text + TRUE + 242 23 391 484 + + + remb + Remember This Choice + 415 20 433 186 + + + 0 0 454 507 + 257 653 711 1160 0 0 768 1024 - - + + - - + + -- cgit v1.2.3