diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-02 23:02:42 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-02 23:02:42 +0100 |
| commit | bd7ad9c157776244912e652e93162cbbd32088f1 (patch) | |
| tree | ce7da254212a1d5e0a7a9fdd81b71059046d134f /indra/newview/app_settings | |
| parent | 34d595716bb9224cc4f173bd968db86bc88cbaed (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9a3763895f..aa4eee0d0e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3703,13 +3703,13 @@ <key>FeatureManagerHTTPTable</key> <map> <key>Comment</key> - <string>Base directory for HTTP feature/gpu table fetches</string> + <string>Deprecated</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>String</string> <key>Value</key> - <string>http://viewer-settings.secondlife.com</string> + <string></string> </map> <key>FPSLogFrequency</key> <map> @@ -12280,7 +12280,7 @@ <key>Comment</key> <string>If TRUE, always load textures at full resolution (discard = 0)</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> |