diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2023-01-23 16:29:38 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2023-01-23 16:29:56 +0200 |
| commit | 111fc04e5df60e1d509b9ec80a1340bab4383cce (patch) | |
| tree | aed67acff4dd7497cf39e3a5c3632cacd57126c9 /indra/newview/llaudiosourcevo.cpp | |
| parent | 819eec6f8c3abbf71ec3bdaaf4891068574fdc46 (diff) | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
Merge branch 'main' into DRTVWR-567
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; |