diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-07-18 16:26:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-07-18 16:26:45 -0400 |
| commit | 8c358c57a39cc51dd54a2a110d53b55c7cf08ff7 (patch) | |
| tree | 89fe2c132fe6e54247e4b9e08b61c426612a9c15 /indra/newview/app_settings | |
| parent | 448272d6660b63d010a58d2e0f9d08f414b4b64c (diff) | |
| parent | b83087fae01bed8b815938826db81ebaadbc4e33 (diff) | |
merge changes for MAINT-4532
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 12 |
1 files changed, 12 insertions, 0 deletions
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> |