diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-03 16:19:47 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-03 16:19:47 -0700 |
| commit | 56c773b3bc52d72a5a7056d6eb9ce014dedbc0d8 (patch) | |
| tree | e9c39e4c9255a909ce0996b4cf228d562020fddb /indra/newview/app_settings/settings.xml | |
| parent | 8779b29487dd3d18220b17be8dd501ffeabe274f (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -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 16afdbe9bc..d30657a30a 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> @@ -12302,7 +12302,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> |