From 3be2ce4ec3757c899325a6e2481a6ebeba2d65f5 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 27 Mar 2014 13:46:02 +0100
Subject: [PATCH] FIRE-13309: Add option to hear voice equally from all
 speakers; by Tigh MacFanatic for Singularity Viewer, with permission to use
 under LGPL

---
 indra/newview/llvoicevivox.cpp                |  9 +++++++-
 indra/newview/llvoicevivox.h                  |  3 +++
 .../xui/de/panel_preferences_sound.xml        |  1 +
 .../xui/en/panel_preferences_sound.xml        | 22 ++++++++++++++-----
 4 files changed, 29 insertions(+), 6 deletions(-)

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;
 		
+		// <FS:Ansariel> Equal voice volume; by Tigh MacFanatic
+		if (mEarLocation != earLocSpeaker)
+		{
+		// </FS:Ansariel>
 		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);
-		
+		// <FS:Ansariel> Equal voice volume; by Tigh MacFanatic
+		}
+		// </FS:Ansariel>
+
 		stream 
 			<< "<Position>"
 				<< "<X>" << pos.mdV[VX] << "</X>"
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
+		// <FS:Ansariel> Equal voice volume; by Tigh MacFanatic
+		earLocSpeaker,			// ear at speaker, speakers not affected by position
+		// </FS:Ansariel>
 		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 @@
 		<radio_group name="ear_location">
 			<radio_item label="Kameraposition" name="0"/>
 			<radio_item label="Avatarposition" name="1"/>
+			<radio_item label="Sprecherposition" name="2"/>
 		</radio_group>
 		<check_box label="Avatarlippen beim Sprechen bewegen" name="enable_lip_sync"/>
 		<check_box label="Zeige Voice-Indikator über Avataren" name="FSShowVoiceVisualizer" tool_tip="Wenn diese Option aktiviert ist, wird der Voice-Indicator (weißer Punkt) über Avataren angezeigt."/>
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:
         </text>
+<!--
         <icon
          follows="left|top"
          height="18"
@@ -725,14 +726,16 @@
          visible="true"
          width="18"
          top_delta="0" />
+-->
         <radio_group
          enabled_control="EnableVoiceChat"
          control_name="VoiceEarLocation"
          follows="left|top"
          layout="topleft"
-         left_delta="-168"
-         width="221"
+         left_pad="0"
+         width="400"
          height="20"
+         top_pad="-17"
          name="ear_location">
             <radio_item
              height="19"
@@ -740,7 +743,7 @@
              follows="left|top"
              layout="topleft"
              name="0"
-             width="200"/>
+             width="150"/>
             <radio_item
              height="19"
              follows="left|top"
@@ -749,7 +752,16 @@
              left_pad="-16"
              name="1"
              top_delta ="0"
-             width="200" />
+             width="150" />
+            <radio_item
+             height="19"
+             follows="left|top"
+             label="Speaker position"
+             layout="topleft"
+             left_pad="-16"
+             name="2"
+             top_delta ="0"
+             width="150" />
         </radio_group>
 
         <check_box