diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
| commit | f4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (patch) | |
| tree | f0b89a006e52e38039d142048adf9034cbcb2b76 /indra/newview/app_settings/settings_files.xml | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
| parent | 7f6e7fc0cb15d5367d48a3d8084d1a0b319575b7 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings_files.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings_files.xml | 3 |
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"/> |