diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/mac_crash_logger | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
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
Diffstat (limited to 'indra/mac_crash_logger')
| -rw-r--r-- | indra/mac_crash_logger/CrashReporter.nib/info.nib | 8 | ||||
| -rw-r--r-- | indra/mac_crash_logger/CrashReporter.nib/objects.xib | 59 |
2 files changed, 32 insertions, 35 deletions
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 @@ <key>IBFramework Version</key> <string>629</string> <key>IBLastKnownRelativeProjectPath</key> - <string>../macview.xcodeproj</string> + <string>../../build-darwin-i386/SecondLife.xcodeproj</string> <key>IBOldestOS</key> <integer>5</integer> <key>IBOpenObjects</key> - <array> - <integer>193</integer> - </array> + <array/> <key>IBSystem Version</key> - <string>9B18</string> + <string>9E17</string> <key>targetFramework</key> <string>IBCarbonFramework</string> </dict> 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 @@ <object name="rootObject" class="NSCustomObject" id="1"> </object> <array count="7" name="allObjects"> - <object class="IBCarbonStaticText" id="181"> - <string name="title">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. </string> - <string name="bounds">20 20 231 487 </string> + <object class="IBCarbonButton" id="182"> + <ostype name="command">ok </ostype> + <string name="title">Send Report</string> + <string name="bounds">414 273 434 378 </string> </object> <object class="IBCarbonButton" id="183"> <ostype name="command">not!</ostype> @@ -13,49 +14,47 @@ <string name="title">Don't Send</string> <string name="bounds">414 390 434 487 </string> </object> - <object class="IBCarbonRootControl" id="167"> - <array count="5" name="subviews"> - <reference idRef="181"/> - <object class="IBCarbonButton" id="182"> - <ostype name="command">ok </ostype> - <string name="title">Send Report</string> - <string name="bounds">414 273 434 378 </string> - </object> - <reference idRef="183"/> - <object class="IBCarbonEditText" id="185"> - <ostype name="controlSignature">text</ostype> - <boolean name="isUnicode">TRUE</boolean> - <string name="bounds">242 23 391 484 </string> - </object> - <object class="IBCarbonCheckBox" id="193"> - <ostype name="controlSignature">remb</ostype> - <int name="initialState">1</int> - <string name="title">Remember This Choice</string> - <string name="bounds">415 20 433 186 </string> - </object> - </array> - <string name="bounds">0 0 454 507 </string> + <object class="IBCarbonStaticText" id="181"> + <string name="title">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. </string> + <string name="bounds">20 20 231 487 </string> </object> <object class="IBCarbonWindow" id="166"> <int name="carbonWindowClass">2</int> <int name="themeBrush">3</int> <int name="windowPosition">7</int> <string name="title">Second Life Crash Logger</string> - <reference name="rootControl" idRef="167"/> + <object name="rootControl" class="IBCarbonRootControl" id="167"> + <array count="5" name="subviews"> + <reference idRef="181"/> + <reference idRef="182"/> + <reference idRef="183"/> + <object class="IBCarbonEditText" id="185"> + <ostype name="controlSignature">text</ostype> + <boolean name="isUnicode">TRUE</boolean> + <string name="bounds">242 23 391 484 </string> + </object> + <object class="IBCarbonCheckBox" id="193"> + <ostype name="controlSignature">remb</ostype> + <string name="title">Remember This Choice</string> + <string name="bounds">415 20 433 186 </string> + </object> + </array> + <string name="bounds">0 0 454 507 </string> + </object> <string name="windowRect">257 653 711 1160 </string> <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string> </object> - <reference idRef="193"/> <reference idRef="185"/> - <reference idRef="182"/> + <reference idRef="167"/> + <reference idRef="193"/> </array> <array count="7" name="allParents"> <reference idRef="167"/> <reference idRef="167"/> - <reference idRef="166"/> - <reference idRef="1"/> <reference idRef="167"/> + <reference idRef="1"/> <reference idRef="167"/> + <reference idRef="166"/> <reference idRef="167"/> </array> <dictionary count="2" name="nameTable"> |