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 | |
| 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')
| -rwxr-xr-x | indra/llvfs/lldir.h | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings_files.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index cc10ed5bbd..e02bf552aa 100755 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -32,7 +32,7 @@ #define MAX_PATH MAXPATHLEN #endif -// these numbers *may* get serialized (really??), so we need to be explicit +// these numbers are read from settings_files.xml, so we need to be explicit typedef enum ELLPath { LL_PATH_NONE = 0, 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"/> |