summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings_files.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-07 12:17:39 -0400
committerOz Linden <oz@lindenlab.com>2013-08-07 12:17:39 -0400
commit86b4019684af96a64a1d439851f177d7c18e4c24 (patch)
tree45a8166a884811d81d4d0e6189514378ca1661ce /indra/newview/app_settings/settings_files.xml
parentcfd80c02c317591b7a52f719e3560de8912660b5 (diff)
parentf4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (diff)
merge changes for DRTVWR-333
Diffstat (limited to 'indra/newview/app_settings/settings_files.xml')
-rwxr-xr-xindra/newview/app_settings/settings_files.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml
index bfc09286e3..4a9e522a96 100755
--- a/indra/newview/app_settings/settings_files.xml
+++ b/indra/newview/app_settings/settings_files.xml
@@ -4,6 +4,9 @@
<file name="Global"
file_name="settings.xml"
required="true"/>
+ <file name="Global"
+ file_name="settings_install.xml"
+ required="false"/>
<file name="PerAccount"
file_name="settings_per_account.xml"
required="true"/>