From df4d167cd13fd89a85e4d30dca94e40c934707d7 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Fri, 21 Dec 2007 06:44:41 +0000 Subject: svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome. --- indra/llcommon/indra_constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/indra_constants.h') diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index b7d35780ae..0195893b16 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -336,7 +336,7 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08; // Crash reporter behavior const char* const CRASH_SETTINGS_FILE = "crash_settings.xml"; -const char* const CRASH_BEHAVIOR_SETTING = "CrashBehavior"; +const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior"; const S32 CRASH_BEHAVIOR_ASK = 0; const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1; const S32 CRASH_BEHAVIOR_NEVER_SEND = 2; -- cgit v1.2.3