Revert "Add toggles to avatar dropdown for hear sound or voice from avatar. (#2518, #2519)"

This reverts commit 6af471482d6801530915c1c9ae4bdf788af52eae.

4 files changed, 0 insertions, 42 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ca35608175..3d4f5e1054 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -355,20 +355,6 @@ bool LLAgent::isMicrophoneOn(const LLSD& sdname)
     return LLVoiceClient::getInstance()->getUserPTTState();
 }
 
-//static
-void LLAgent::toggleHearMediaSoundFromAvatar()
-{
-    const S32 mediaSoundsEarLocation = gSavedSettings.getS32("MediaSoundsEarLocation");
-    gSavedSettings.setS32("MediaSoundsEarLocation", !mediaSoundsEarLocation);
-}
-
-//static
-void LLAgent::toggleHearVoiceFromAvatar()
-{
-    const S32 voiceEarLocation = gSavedSettings.getS32("VoiceEarLocation");
-    gSavedSettings.setS32("VoiceEarLocation", !voiceEarLocation);
-}
-
 // ************************************************************
 // Enabled this definition to compile a 'hacked' viewer that
 // locally believes the end user has godlike powers.
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 448ee575f5..489131d974 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -377,13 +377,6 @@ private:
     bool            mVoiceConnected;
 
     //--------------------------------------------------------------------
-    // Sound
-    //--------------------------------------------------------------------
-public:
-    static void     toggleHearMediaSoundFromAvatar();
-    static void     toggleHearVoiceFromAvatar();
-
-    //--------------------------------------------------------------------
     // Chat
     //--------------------------------------------------------------------
 public:
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 10506e0e74..120a3094cd 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9627,8 +9627,6 @@ void initialize_menus()
     registrar.add("Agent.ToggleMicrophone", boost::bind(&LLAgent::toggleMicrophone, _2), cb_info::UNTRUSTED_BLOCK);
     enable.add("Agent.IsMicrophoneOn", boost::bind(&LLAgent::isMicrophoneOn, _2));
     enable.add("Agent.IsActionAllowed", boost::bind(&LLAgent::isActionAllowed, _2));
-    registrar.add("Agent.ToggleHearMediaSoundFromAvatar", boost::bind(&LLAgent::toggleHearMediaSoundFromAvatar), cb_info::UNTRUSTED_BLOCK);
-    registrar.add("Agent.ToggleHearVoiceFromAvatar", boost::bind(&LLAgent::toggleHearVoiceFromAvatar), cb_info::UNTRUSTED_BLOCK);
 
     // File menu
     init_menu_file();
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e1d33e5bc3..1c645d8d70 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -562,25 +562,6 @@
         </menu_item_check>
         <menu_item_separator/>
         <menu_item_check
-          label="Hear Media and Sound from Avatar"
-          name="Hear Media and Sound from Avatar">
-            <menu_item_check.on_check
-             control="MediaSoundsEarLocation" />
-            <menu_item_check.on_click
-             function="Agent.ToggleHearMediaSoundFromAvatar" />
-        </menu_item_check>
-        <menu_item_check
-          label="Hear Voice from Avatar"
-          name="Hear Voice from Avatar">
-            <menu_item_check.on_check
-             control="VoiceEarLocation" />
-            <menu_item_check.on_click
-             function="Agent.ToggleHearVoiceFromAvatar" />
-            <menu_item_call.on_enable
-             control="EnableVoiceChat" />
-        </menu_item_check>
-        <menu_item_separator/>
-        <menu_item_check
          label="Gestures..."
          name="Gestures"
          shortcut="control|G">