diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 10:55:47 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 10:55:47 +0200 |
commit | 5715cda6e061294ae344ff6275ee4c643b91bf0f (patch) | |
tree | 6d5a14ed98695b6c12602d1b47ac27e7730de13c /indra/newview/app_settings | |
parent | b9793dc6e79597fc2c6f518f3a4dad75b5229beb (diff) | |
parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9c4811da7f..1173abf18e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4404,6 +4404,17 @@ <key>Value</key> <real>96.0</real> </map> + <key>ForceAddressSize</key> + <map> + <key>Comment</key> + <string>Force Windows update to 32-bit or 64-bit viewer.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ForceAssetFail</key> <map> <key>Comment</key> @@ -13598,7 +13609,7 @@ <key>UpdaterServiceURL</key> <map> <key>Comment</key> - <string>Default location for the updater service.</string> + <string>Obsolete; no longer used.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> @@ -14079,17 +14090,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>VerboseLogs</key> - <map> - <key>Comment</key> - <string>Display source file and line number for each log item for debugging purposes</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>VertexShaderEnable</key> <map> <key>Comment</key> @@ -16271,7 +16271,7 @@ <string>if true, disables running the GPU benchmark at startup (default to class 1)</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> |