Scratching an ooooold itch: added 'Gestures' slider and mute button to the audio controls

8 files changed, 61 insertions, 11 deletions

diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index e990eb7..e46091c 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -93,7 +93,8 @@ public:
                 AUDIO_TYPE_SFX     = 1,
                 AUDIO_TYPE_UI      = 2,
                 AUDIO_TYPE_AMBIENT = 3,
-                AUDIO_TYPE_COUNT   = 4 // last
+                AUDIO_TYPE_GESTURE = 4,
+                AUDIO_TYPE_COUNT   = 5 // last
         };
         
         LLAudioEngine();
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index aae182c..d71cf09 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -15,6 +15,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>AudioLevelGestures</key>
+  <map>
+    <key>Comment</key>
+    <string>Audio level of environment gestures</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
   <key>AutoCloseOOC</key>
   <map>
     <key>Comment</key>
@@ -431,6 +442,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>MuteGestures</key>
+  <map>
+    <key>Comment</key>
+    <string>Gesture sound effects, play at 0 volume</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>MuteWind</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index 999e5dc..f043fb5 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -150,6 +150,8 @@ void audio_update_volume(bool force_update)
                                                                   gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI"));
                 gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_AMBIENT,
                                                                   gSavedSettings.getBOOL("MuteAmbient") ? 0.f : gSavedSettings.getF32("AudioLevelAmbient"));
+                gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_GESTURE,
+                                                                  gSavedSettings.getBOOL("MuteGestures") ? 0.f : gSavedSettings.getF32("AudioLevelGestures"));
         }
 
         // Streaming Music
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index cca737c..0edb2c4 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -582,6 +582,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("AudioLevelMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelGestures")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelDistance")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
@@ -593,6 +594,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("MuteVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("MuteAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("MuteUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteGestures")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("RenderVBOEnable")->getSignal()->connect(boost::bind(&handleRenderUseVBOChanged, _1));
         gSavedSettings.getControl("WLSkyDetail")->getSignal()->connect(boost::bind(&handleWLSkyDetailChanged, _1));
         gSavedSettings.getControl("RenderLightingDetail")->getSignal()->connect(boost::bind(&handleRenderLightingDetailChanged, _1));
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 140b517..ca7c613 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3959,6 +3959,19 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
                 return;
         }
 
+        // Don't load sounds if we have gestures muted -- MC
+        if ((owner_id != gAgent.getID()) && (object_id == owner_id))
+        {
+                if (gSavedSettings.getBOOL("MuteGestures"))
+                {
+                        return;
+                }
+                else
+                {
+                        gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_GESTURE, pos_global);
+                }
+        }
+
         // Don't play sounds from a region with maturity above current agent maturity
         // Actually, let's -- MC
         /*if( !gAgent.canAccessMaturityInRegion( region_handle ) )
@@ -4000,11 +4013,12 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
         // help us out.
 
         // Don't play sounds from a region with maturity above current agent maturity
-        LLVector3d pos_global = objectp->getPositionGlobal();
+        // Actually, let's -- MC
+        /*LLVector3d pos_global = objectp->getPositionGlobal();
         if( !gAgent.canAccessMaturityAtGlobal( pos_global ) )
         {
                 return;
-        }
+        }*/
         
         // Add audioData starts a transfer internally.
         sourcep->addAudioData(datap, FALSE);
@@ -4040,11 +4054,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
 
         
         // Don't play sounds from a region with maturity above current agent maturity
-        LLVector3d pos = objectp->getPositionGlobal();
+        // Actually, let's -- MC
+        /*LLVector3d pos = objectp->getPositionGlobal();
         if( !gAgent.canAccessMaturityAtGlobal(pos) )
         {
                 return;
-        }
+        }*/
         
         objectp->setAttachedSound(sound_id, owner_id, gain, flags);
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
index ee9695e..c6e75fc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -49,6 +49,14 @@
              image_selected="icn_speaker-muted_dark.tga"
              image_unselected="icn_speaker_dark.tga" label="" label_width="55"
              left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
+  <slider bottom_delta="-20" control_name="AudioLevelGestures" follows="left|top|right"
+       height="15" increment="0.05" initial_val="0.5" label="Gestures:"
+       label_width="55" left="10" max_val="1" min_val="0" name="Gestures"
+       show_text="false" volume="true" width="180" />
+  <button bottom_delta="0" control_name="MuteGestures" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_gestures" tab_stop="false" toggle="true" width="25" />
         <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
              height="15" increment="0.05" initial_val="0.5" label="Interface:" label_width="55"
              left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
index 7266536..3fdea5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
@@ -2,8 +2,8 @@
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
      follows="right|bottom" height="185" left="0" name="media_remote"
      use_bounding_rect="true" width="220">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" />
-        <panel border="false" bottom="22" filename="panel_audio.xml" height="160"
+        <panel bottom="0" filename="panel_bg_tab.xml" height="197" left="0" width="220" />
+        <panel border="false" bottom="22" filename="panel_audio.xml" height="174"
              label="Audio &amp; Video" name="Volume Panel" width="220" />
         <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
                 <string name="play_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 400da56..c6bb938 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -20,10 +20,10 @@
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio:
         </text>
-        <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
+        <panel border="true" bottom="-187" enabled="true" filename="panel_audio.xml"
              follows="left|top|right|bottom" height="180" label="Volume" left="148"
              mouse_opaque="true" name="Volume Panel" width="260" />
-        <check_box bottom="-195" control_name="AudioStreamingMusic" enabled="true"
+        <check_box bottom="-205" control_name="AudioStreamingMusic" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play streaming music when available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
@@ -42,7 +42,7 @@
              initial_value="true" label="Automatically play media" left="162"
              mouse_opaque="true" name="auto_streaming_video" radio_style="false"
              width="338" />
-        <check_box bottom_delta="-34" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Mute audio when window minimized" left="142" mouse_opaque="true"
              name="mute_when_minimized" radio_style="false" width="215" />
@@ -57,7 +57,7 @@
              label_width="158" left="148" max_val="10000" min_val="0"
              mouse_opaque="true" name="Health change threshold" width="212" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
        mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128">
     Ambient: