diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-28 18:28:13 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-28 18:28:13 -0800 |
| commit | bf8dee73f90f74f3eb9fd544dc9673defa52817f (patch) | |
| tree | 3e8a711051c699fe96afcfead0e3fd4dc4f19db3 /indra/newview/app_settings | |
| parent | c1d2416826406631807f153e7de9d2b790b0caa5 (diff) | |
| parent | e1a76999c3e8aad337d765fcd6eb50c8191409ea (diff) | |
Merge 6.1.1
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 bb5ff19176..3e8a854df3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4415,6 +4415,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> @@ -13646,7 +13657,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> @@ -14127,17 +14138,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> @@ -16363,7 +16363,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> |