diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-07-19 11:31:36 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-07-19 11:31:36 -0700 |
| commit | b131aa40feac36a6199f4a2d673c1b3600323481 (patch) | |
| tree | 99edf2d2f1111bd74f87d2208bd1d6ca5f16501c /indra/newview/app_settings | |
| parent | 2ab0db467a4b0edc36043aaa6b7c24c0c772900a (diff) | |
| parent | 1b20e3e7b852acb3d93d1c6983142b55cb220de1 (diff) | |
merge from viewer64-vmp-integration
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index a9f6079630..e4e1cdcf44 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -81,7 +81,7 @@ <key>map-to</key> <string>PacketDropPercentage</string> </map> - + <key>god</key> <map> <key>desc</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fbc984692d..203044ffec 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16132,6 +16132,18 @@ <key>Value</key> <integer>0</integer> </map> + <key>SkipBenchmark</key> + <map> + <key>Comment</key> + <string>if true, disables running the GPU benchmark at startup + (default to class 1)</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |