From 7783b835f0e5bd117c20199973084c4c00796a2c Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sun, 18 Aug 2013 02:07:12 -0400
Subject: [PATCH] Fix swapped enum so I don't break anything unexpected.

---
 indra/newview/llvoicevivox.h                                  | 4 ++--
 .../skins/default/xui/en-us/panel_preferences_voice.xml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index c1efcc38d..329d7248f 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -786,8 +786,8 @@ 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
+		earLocMixed,			// ear at avatar location/camera direction
+        earLocSpeaker           // eat at speaker, speakers not affected by position
 	};
 
 	S32			mEarLocation;
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 479ed0b7d..fe49f379d 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
@@ -7,7 +7,7 @@
 	<radio_group bottom_delta="-66" draw_border="false" follows="top" height="60" left_delta="20" name="ear_location" width="364">
 		<radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item>
 		<radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item>
-    <radio_item bottom="-51" height="16" name="2">Hear Voice Chat equally from everyone.</radio_item>
+    <radio_item bottom="-51" height="16" name="3">Hear Voice Chat equally from everyone.</radio_item>
   </radio_group>
 	<text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Push To Talk</text>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Use Push-to-Talk in toggle mode" name="push_to_talk_toggle_check" tool_tip="When enabled, press the push-to-talk trigger to switch your microphone on and off. When disabled, the microphone is off unless the trigger is being held down."/>