From 9746cf5310871f305a1419163c5adfbed3f1534b Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 26 Jul 2007 01:22:23 +0000 Subject: EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392 ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing) --- indra/linux_crash_logger/linux_crash_logger.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 1b7d2870dc..54c257b77b 100644 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -34,10 +34,8 @@ static const char dialog_text[] = "Second Life appears to have crashed.\n" "This crash reporter collects information about your computer's hardware, operating system, and some Second Life logs, which are used for debugging purposes only.\n" "Sending crash reports is the best way to help us improve the quality of Second Life.\n" -"If you continue to experience this problem, please try one of the following:\n" -"- Contact support by email at support@lindenlab.com\n" -"- If you can log-in, please contact Live Help by using menu Help > Live Help.\n" -"- Search the Second Life Knowledge Base at http://secondlife.com/knowledgebase/\n" +"If you continue to experience this problem, please try:\n" +"- Contacting support by visiting http://www.secondlife.com/support\n" "\n" "Send crash report?"; -- cgit v1.2.3