summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings_files.xml
diff options
context:
space:
mode:
authorAaron Stone <stone@lindenlab.com>2011-07-12 15:48:02 -0700
committerAaron Stone <stone@lindenlab.com>2011-07-12 15:48:02 -0700
commit42daa3497b6626cbb5f32ba54162558cd025069b (patch)
tree65fb889b9aefe63171de33d21de93bb81c832733 /indra/newview/app_settings/settings_files.xml
parent66dcc72870b19c6ada65a643ca33c779c9c9989b (diff)
STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
Diffstat (limited to 'indra/newview/app_settings/settings_files.xml')
-rw-r--r--indra/newview/app_settings/settings_files.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml
index 079a54f957..bfc09286e3 100644
--- a/indra/newview/app_settings/settings_files.xml
+++ b/indra/newview/app_settings/settings_files.xml
@@ -20,7 +20,8 @@
file_name="settings.xml"
file_name_setting="ClientSettingsFile"/>
<file name="CrashSettings"
- file_name="settings_crash_behavior"/>
+ file_name="settings_crash_behavior.xml"
+ file_name_setting="CrashSettingsFile"/>
<file name="Warnings"
file_name="ignorable_dialogs.xml"
file_name_setting="WarningSettingsFile"/>
@@ -61,4 +62,4 @@
file_name="colors.xml"
file_name_setting="SkinningSettingsFile"/>
</group>
-</settings_files> \ No newline at end of file
+</settings_files>