diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index e0cf09e26..a4713ef1b 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2564,41 +2564,44 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void) stream << ""; - LLVector3d earPosition; - LLVector3 earVelocity; - LLMatrix3 earRot; + if (mEarLocation != earLocSpeaker) + { + LLVector3d earPosition; + LLVector3 earVelocity; + LLMatrix3 earRot; - switch(mEarLocation) - { - case earLocCamera: - default: - earPosition = mCameraPosition; - earVelocity = mCameraVelocity; - earRot = mCameraRot; - break; + switch(mEarLocation) + { + case earLocCamera: + default: + earPosition = mCameraPosition; + earVelocity = mCameraVelocity; + earRot = mCameraRot; + break; - case earLocAvatar: - earPosition = mAvatarPosition; - earVelocity = mAvatarVelocity; - earRot = mAvatarRot; - break; + case earLocAvatar: + earPosition = mAvatarPosition; + earVelocity = mAvatarVelocity; + earRot = mAvatarRot; + break; - case earLocMixed: - earPosition = mAvatarPosition; - earVelocity = mAvatarVelocity; - earRot = mCameraRot; - break; - } + case earLocMixed: + earPosition = mAvatarPosition; + earVelocity = mAvatarVelocity; + earRot = mCameraRot; + break; + } - l = earRot.getLeftRow(); - u = earRot.getUpRow(); - a = earRot.getFwdRow(); - pos = earPosition; - vel = earVelocity; + l = earRot.getLeftRow(); + u = earRot.getUpRow(); + a = earRot.getFwdRow(); + pos = earPosition; + vel = earVelocity; // LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL; - oldSDKTransform(l, u, a, pos, vel); + oldSDKTransform(l, u, a, pos, vel); + } stream << "" diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index 49b2132ac..c1efcc38d 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -786,6 +786,7 @@ private: { earLocCamera = 0, // ear at camera earLocAvatar, // ear at avatar + earLocSpeaker, // eat at speaker, speakers not affected by position earLocMixed // ear at avatar location/camera direction }; diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml index c25f36291..479ed0b7d 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml @@ -4,10 +4,11 @@ - + Hear Voice Chat from camera position. Hear Voice Chat from avatar position. - + Hear Voice Chat equally from everyone. + Push To Talk Push-to-Talk trigger: