diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-06-27 11:07:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-06-27 11:07:12 -0400 |
| commit | d5febe1ab553749808198ec4e0c78ec64d4d9588 (patch) | |
| tree | ce75d277f38f0ba05f95cfd34f595e37d23f501e /indra/newview | |
| parent | b0d7619f20c7ec3da0f9f19dfcc9162c6f0feb9a (diff) | |
CHOP-956: Add settings_install.xml to settings_files.xml.
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from
settings_files.xml.
Diffstat (limited to 'indra/newview')
| -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"/> |