diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-16 08:05:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-16 08:05:26 -0400 |
| commit | 2f49b60ddcb4b5682aca6f7c8607fb8e76472264 (patch) | |
| tree | edfc56bbe198481714e20662352aaa0c1ef23822 /indra/llcommon | |
| parent | ae805d511d6135fec3938d822d7e6542d605cb7b (diff) | |
| parent | 14a06fd1c843c033bd670fad4f6b83d18d5107c1 (diff) | |
merge changes for storm-1482
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index d0f287657e..0745696ef3 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -387,8 +387,6 @@ const S32 MAP_SIM_RETURN_NULL_SIMS = 0x00010000; const S32 MAP_SIM_PRELUDE = 0x00020000; // Crash reporter behavior -const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml"; -const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior"; const S32 CRASH_BEHAVIOR_ASK = 0; const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1; const S32 CRASH_BEHAVIOR_NEVER_SEND = 2; |