diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 14:35:44 -0700 |
| commit | 8631a7a07743af00431c6f33361ab06405bcf114 (patch) | |
| tree | e7d983394f5ca0cbe2465780e8205cf32ba67ad3 /indra/newview/app_settings | |
| parent | 57da3e609fddb37ef3ddef830a0be84ebc5337bd (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with tip of Master after a Viewer release
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index deb09252f2..e2847fcae9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14324,19 +14324,6 @@ <key>Value</key> <integer>1</integer> </map> - <!-- SL-12594 removes fixed function rendering - <key>VertexShaderEnable</key> - <map> - <key>Comment</key> - <string>Enable/disable all GLSL shaders (debug)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <--> <key>VivoxAutoPostCrashDumps</key> <map> <key>Comment</key> @@ -14425,7 +14412,7 @@ <key>Value</key> <integer>44125</integer> </map> - + <key>VivoxVadAuto</key> <map> <key>Comment</key> @@ -14462,8 +14449,7 @@ <key>VivoxVadSensitivity</key> <map> <key>Comment</key> - <string> - A dimensionless value between 0 and 100, indicating the 'sensitivity of the VAD'. Increasing this value corresponds to decreasing the sensitivity of the VAD and 0 is turned off altogether</string> + <string>A dimensionless value between 0 and 100, indicating the 'sensitivity of the VAD'. Increasing this value corresponds to decreasing the sensitivity of the VAD and 0 is turned off altogether</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |