From af21783ffa06c6fd97c34856ad620fc14e89bb98 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 2 Jul 2024 13:52:51 -0700 Subject: EnableVoiceMorphing should default to true --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llvoiceclient.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 38d7555053..0a84bf8390 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13043,7 +13043,7 @@ Type Boolean Value - 0 + 1 AutoDisengageMic diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 779f4e3176..f128c03023 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -137,7 +137,7 @@ LLVoiceClient::LLVoiceClient(LLPumpIO *pump) mSpatialVoiceModule(NULL), mNonSpatialVoiceModule(NULL), m_servicePump(NULL), - mVoiceEffectEnabled(LLCachedControl(gSavedSettings, "VoiceMorphingEnabled", false)), + mVoiceEffectEnabled(LLCachedControl(gSavedSettings, "VoiceMorphingEnabled", true)), mVoiceEffectDefault(LLCachedControl(gSavedPerAccountSettings, "VoiceEffectDefault", "00000000-0000-0000-0000-000000000000")), mVoiceEffectSupportNotified(false), mPTTDirty(true), -- cgit v1.2.3 From 3c71230aa4569f1c238a5f645b5a5b7447ec389e Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 2 Jul 2024 21:03:30 -0700 Subject: don't set voice font for vivox --- indra/newview/llvoiceclient.cpp | 2 +- indra/newview/llvoicevivox.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index f128c03023..490c7174c5 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -577,7 +577,7 @@ bool LLVoiceClient::onVoiceEffectsNotSupported(const LLSD ¬ification, const L switch (option) { case 0: // "Okay" - gSavedSettings.setBOOL("VoiceMorphingEnabled", FALSE); + gSavedPerAccountSettings.setString("VoiceEffectDefault", LLUUID::null.asString()); break; case 1: // "Cancel" diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 1833aeb54f..4694ea92bb 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2538,7 +2538,6 @@ void LLVivoxVoiceClient::sessionCreateSendMessage(const sessionStatePtr_t &sessi stream << "" << (startAudio?"true":"false") << "" << "" << (startText?"true":"false") << "" - << "" << font_index << "" << "" << mChannelName << "" << "\n\n\n"; LL_WARNS("Voice") << "Session.Create: " << stream.str() << LL_ENDL; @@ -2577,7 +2576,6 @@ void LLVivoxVoiceClient::sessionGroupAddSessionSendMessage(const sessionStatePtr << "" << mChannelName << "" << "" << (startAudio?"true":"false") << "" << "" << (startText?"true":"false") << "" - << "" << font_index << "" << "" << password << "" << "SHA1UserName" << "\n\n\n" @@ -2601,7 +2599,6 @@ void LLVivoxVoiceClient::sessionMediaConnectSendMessage(const sessionStatePtr_t << "mHandle << "\" action=\"Session.MediaConnect.1\">" << "" << session->mGroupHandle << "" << "" << session->mHandle << "" - << "" << font_index << "" << "Audio" << "\n\n\n"; -- cgit v1.2.3 From d1b1bb12cb76d97d03c3d83695a034a033b89699 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 3 Jul 2024 11:26:39 -0700 Subject: Sync autobuild.xml up with release autobuild. --- autobuild.xml | 216 +++++++++++++++++++++++----------------------------------- 1 file changed, 87 insertions(+), 129 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bed9ce997f..92bacba33d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -384,11 +384,11 @@ archive hash - f6835c4d7745cd1cadfbce47b40331d08affb532 + e03eb77224290c875ff84f75b7fe3d0e7c162c94 hash_algorithm sha1 url - https://github.com/secondlife/3p-dictionaries/releases/download/v1.0.1-dev2.gf887629-f887629/dictionaries-common-None.tar.zst + https://github.com/secondlife/3p-dictionaries/releases/download/v1-a01bb6c/dictionaries-1.a01bb6c-common-a01bb6c.tar.zst name common @@ -401,7 +401,7 @@ copyright Copyright 2014 Apache OpenOffice software version - None + 1.a01bb6c name dictionaries description @@ -572,11 +572,11 @@ creds github hash - fb6797ff93b6e881b060d2a8b396d8d7477834ee + a2074b67de7ad4c04b5ca8f8f161506add9697b2 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908444 + https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207589 name darwin64 @@ -588,11 +588,11 @@ creds github hash - a378bd1604aa97ca763140911f9f4e463ced85c0 + 8c1b701648c077220dbc576c3d9aefbef47f8324 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908446 + https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207592 name linux64 @@ -604,11 +604,11 @@ creds github hash - 72304491d86bd797b840999b255358f195b06609 + 7e0c3d50e8b99d8735c6c9596a72ded9ee2bc1c8 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908456 + https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207594 name windows64 @@ -621,7 +621,7 @@ copyright FMOD Studio by Firelight Technologies Pty Ltd. version - 2.02.13.578928 + 2.02.20.c78ef55 name fmodstudio description @@ -772,11 +772,11 @@ archive hash - 6604c1cca515d287e697997a8d5593d1cae172a9 + 066625e7aa7f697a4b6cd461aad960c57181011f hash_algorithm sha1 url - https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev2.g3253ed7-3253ed7/glh_linear-common-None.tar.zst + https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev4-984c397/glh_linear-1.0.1-dev4-common-984c397.tar.zst name common @@ -789,7 +789,7 @@ copyright Copyright (c) 2000 Cass Everitt version - None + 1.0.1-dev4 name glh_linear description @@ -908,11 +908,11 @@ creds github hash - a193ff65d6db48626d65d96c6124c6efca85e8ec + ae2c2a215b1bc2e3f37a67e301926dc405902d1a hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912596 + https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778143 name darwin64 @@ -936,11 +936,11 @@ creds github hash - ebfb82b6143874e7938b9d1e8a70d0a2e28aa818 + 0393dd75c58f7046bed47e62a8884a78cb02a5c3 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599 + https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778145 name windows64 @@ -1146,11 +1146,11 @@ creds github hash - bcc7e2c34896fc9cbc41828dee8a4ddf54f10453 + ad72fa1d103df777906f0d98f3e882b9916aeada hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298968 + https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774118 name darwin64 @@ -1162,11 +1162,11 @@ creds github hash - 9de772df2ed12e9c742df6c90670c7cbbb9c93a6 + e46e4ac93a237b5c4a14183766f76ba5d58935a2 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298969 + https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774125 name linux64 @@ -1178,15 +1178,31 @@ creds github hash - 92533ff0f8c1881ad85e75800f9072c413ccf7b7 + bb37557f78c72b26580a521f8b8dabfa1b34e6e6 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298970 + https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774126 name windows64 + linux + + archive + + creds + github + hash + 711b82f9f588d3a125af7dcd8c81f93d9c343a7d + hash_algorithm + sha1 + url + https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774121 + + name + linux + license Kakadu @@ -1195,7 +1211,7 @@ copyright Kakadu software version - 7.10.4.539108 + 7.10.4.4b9ec5f name kdu description @@ -1494,11 +1510,11 @@ archive hash - e50ea94bbaa4ff41bf53b84b7192df1a694c5337 + a9503e1b4e1d9790cf29d18a3d9ab39e6a515679 hash_algorithm sha1 url - https://github.com/secondlife/llca/releases/download/v202310121525.0-d22bd98/llca-202310121530.0-common-d22bd98.tar.zst + https://github.com/secondlife/llca/releases/download/v202402012004.0-0f5d9c3/llca-202402012004.0-common-0f5d9c3.tar.zst name common @@ -1527,11 +1543,11 @@ creds github hash - 48bca5d0233d1e724a59f649a2c6c7ac5f40ec3c + b037cc0b29ea70ee834cfae6dda5b7a25cd57174 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/117009335 + https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851460 name darwin64 @@ -1543,11 +1559,11 @@ creds github hash - 39f52d0350e130f41c5c758f7cb94e87b962c223 + bdea1fd5c4da9da5afde088d16188b45d0853e04 hash_algorithm sha1 url - https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/117009336 + https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851461 name linux64 @@ -1559,11 +1575,11 @@ creds github hash - 7b5e645fb7eb399abbea63bd21e8063bbb32a911 + f652ce0d6aef864689f0ed44255da4d9cd65a43f hash_algorithm sha1 url - https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/117009339 + https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851463 name windows64 @@ -1576,7 +1592,7 @@ copyright Copyright (c) 2010, Linden Research, Inc. version - 1.0.565768 + 1.0.479d20a name llphysicsextensions_source @@ -1760,6 +1776,18 @@ mikktspace + canonical_repo + https://bitbucket.org/lindenlab/3p-mikktspace + copyright + Copyright (C) 2011 by Morten S. Mikkelsen, Copyright (C) 2022 Blender Authors + description + Mikktspace Tangent Generator + license + Apache 2.0 + license_file + mikktspace.txt + name + mikktspace platforms darwin64 @@ -1805,20 +1833,8 @@ windows64 - license - Apache 2.0 - license_file - mikktspace.txt - copyright - Copyright (C) 2011 by Morten S. Mikkelsen, Copyright (C) 2022 Blender Authors version 1 - name - mikktspace - canonical_repo - https://bitbucket.org/lindenlab/3p-mikktspace - description - Mikktspace Tangent Generator minizip-ng @@ -2467,9 +2483,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 4dad1c0948141e1667c01a3ee755e4dc + 2c47ae2d0c38c86b8c2db8d9317f0ab15edfc74f + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105849/926137/tinygltf-v2.5.0-common-575729.tar.bz2 + https://github.com/secondlife/3p-tinygltf/releases/download/v2.5.0-1ae57fd/tinygltf-v2.5.0-common-1ae57fd.tar.zst name common @@ -2503,9 +2521,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9b6e1a1f4b0969d38a1ca8ee00aeb548 + 49650353442698c3e05102676fe427d0ebe02f0b + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2 + https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-eecbf72/tracy-v0.8.1-eecbf72-darwin64-eecbf72.tar.zst name darwin64 @@ -2515,11 +2535,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 05b72ae5d733aed7d3bf142287601cc6 + 2b80e7407e4f3e82eff3879add0e9ad63e7fcace hash_algorithm - md5 + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2 + https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-eecbf72/tracy-v0.8.1-eecbf72-windows64-eecbf72.tar.zst name windows64 @@ -2532,7 +2552,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl) version - v0.8.1.578241 + v0.8.1-eecbf72 name tracy canonical_repo @@ -2731,8 +2751,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors LICENSE copyright Copyright (c) 2000-2012, Linden Research, Inc. - version - 3.0-f14b5ec name viewer-manager description @@ -2741,6 +2759,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors https://bitbucket.org/lindenlab/vmp-standalone source_type hg + version + 3.0-f14b5ec vlc-bin @@ -2850,51 +2870,29 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors platforms - darwin64 - - archive - - hash - 8cff2060843db3db788511ee34a8e8cc - url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2 - - name - darwin64 - - windows - - archive - - hash - 58eea384be49ba756ce9c5e66669540b - url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2 - - name - windows - - windows64 + common archive hash - 79b6a11622c2f83cfc2b7cd1fafb867b + 8e365eff8dcace48d91e2530f8b13e420849aefc + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2 + https://github.com/secondlife/3p-vulkan-gltf-pbr/releases/download/v1.0.0-d7c372f/vulkan_gltf-1.0.0-common-d7c372f.tar.zst name - windows64 + common license Copyright (c) 2018 Sascha Willems license_file - LICENSES/vulkan_gltf.txt + vulkan_gltf.txt copyright Copyright (c) 2018 Sascha Willems version - 1 + 1.0.0 name vulkan_gltf canonical_repo @@ -2977,54 +2975,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e4f77ba0a9b8ec3cc3fabc51c4da81d2 - url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110070/956941/xxhash-0.8.1.578006-windows-578006.tar.bz2 - - name - common - - darwin64 - - archive - - hash - fdcc803a76a3359bb426db7dac161406676d51e7 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1.7501c90/xxhash-0.8.1.7501c90-darwin64-7501c90.tar.zst - - name - darwin64 - - linux64 - - archive - - hash - 7acb3f94a549fbb9bd7bc16604e34f33c5365a9b + 1a73c476b371b62066d1c3eced249660e9467e53 hash_algorithm sha1 url - https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1.7501c90/xxhash-0.8.1.7501c90-linux64-7501c90.tar.zst + https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-69ff69a/xxhash-0.8.1-69ff69a-common-69ff69a.tar.zst name - linux64 - - windows64 - - archive - - hash - 4522d075ea4703ef4b527c3039864ef735ea7953 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1.7501c90/xxhash-0.8.1.7501c90-windows64-7501c90.tar.zst - - name - windows64 + common license @@ -3034,7 +2992,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2012-2021 Yann Collet version - 0.8.1.7501c90 + 0.8.1-69ff69a name xxhash description -- cgit v1.2.3