diff options
author | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
---|---|---|
committer | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
commit | 9ac0b3da77ca0c54161803f23cc37c09e871799d (patch) | |
tree | ec9575c248d6e9cd01d8d15471ceb952c7dba738 /indra/newview/llaudiosourcevo.cpp | |
parent | 5f1c8d311904bd3937f5ba70476e16233f7d21c1 (diff) | |
parent | f39be1dfd30032f10f21cccc29e93c1c49f01df5 (diff) |
SL-18068: Merged DRTVWR-565-maint-P into sl-18068
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; |