diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 717def6191..3d776d05d7 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2406,6 +2406,10 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
LLVector3 earVelocity;
LLMatrix3 earRot;
+ // Equal voice volume; by Tigh MacFanatic
+ if (mEarLocation != earLocSpeaker)
+ {
+ //
switch(mEarLocation)
{
case earLocCamera:
@@ -2437,7 +2441,10 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
// LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
oldSDKTransform(l, u, a, pos, vel);
-
+ // Equal voice volume; by Tigh MacFanatic
+ }
+ //
+
stream
<< ""
<< "" << pos.mdV[VX] << ""
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index e9d50e7687..de28cf34aa 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -783,6 +783,9 @@ private:
{
earLocCamera = 0, // ear at camera
earLocAvatar, // ear at avatar
+ // Equal voice volume; by Tigh MacFanatic
+ earLocSpeaker, // ear at speaker, speakers not affected by position
+ //
earLocMixed // ear at avatar location/camera direction
};
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index b7685e245e..4a3b644045 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -68,6 +68,7 @@
+
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index fabca5b40a..74076c2dc8 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -698,11 +698,12 @@
follows="left|top"
layout="topleft"
left="25"
- top_pad="10"
+ top_pad="5"
name="Listen from"
width="112">
Listen from:
+
+ width="150"/>
+ width="150" />
+