diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 14:56:38 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 14:56:38 +0100 |
| commit | 7b563470fbade848d7eeb52d5088f3ca9b9c6905 (patch) | |
| tree | dc3faed194d6ce8cc8d5b18175dfad17a1490cd8 /indra/newview/llaudiosourcevo.cpp | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge branch 'main' into xcode-14.1
Diffstat (limited to 'indra/newview/llaudiosourcevo.cpp')
| -rw-r--r-- | indra/newview/llaudiosourcevo.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llaudiosourcevo.cpp b/indra/newview/llaudiosourcevo.cpp index 1846238d93..43abbb57ee 100644 --- a/indra/newview/llaudiosourcevo.cpp +++ b/indra/newview/llaudiosourcevo.cpp @@ -102,7 +102,7 @@ LLVector3d LLAudioSourceVO::getPosGlobal() const bool LLAudioSourceVO::isInCutOffRadius(const LLVector3d pos_global, const F32 cutoff) const { - static LLCachedControl<S32> ear_mode(gSavedSettings, "VoiceEarLocation", 0); + static LLCachedControl<S32> ear_mode(gSavedSettings, "MediaSoundsEarLocation", 0); LLVector3d pos_ear; @@ -113,9 +113,6 @@ bool LLAudioSourceVO::isInCutOffRadius(const LLVector3d pos_global, const F32 cu break; case 1: // avatar - case 2: - // voice support 'mixed' in '2' case with agent's position and camera's rotations - // but it is not defined in settings and uses camera as default pos_ear = gAgent.getPositionGlobal(); break; |