diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-07-17 14:31:09 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-07-17 14:31:09 -0700 |
| commit | b054f8db0cdb48b3c235105eb262d5b08087b429 (patch) | |
| tree | 5bb0eb0c5807d19b0bb21f48e180d4e06beee352 /indra/newview/app_settings | |
| parent | 781cbae21bb56023e0a24fee22bba2c72b0347c2 (diff) | |
| parent | 162bb33e15fc9a5bf8dcdddd988dc93fcfb317bd (diff) | |
Merge remote-tracking branch 'origin/release/webrtc-voice' into develop
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4190719504..235d294849 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13122,7 +13122,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>AutoDisengageMic</key> <map> |