diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:20:45 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:20:45 +0300 |
| commit | 2ded530f931f89390162ea9b2126a7339f87e884 (patch) | |
| tree | fb2c39f93db37f61d5837079c4214232034cd052 /indra/newview/app_settings | |
| parent | 7f19c512c9593dd925467a2bc75ad4cf0c3dbca9 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
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 b64965a53b..25e69f1d49 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14340,19 +14340,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> @@ -14441,7 +14428,7 @@ <key>Value</key> <integer>44125</integer> </map> - + <key>VivoxVadAuto</key> <map> <key>Comment</key> @@ -14478,8 +14465,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> |