Combine the two mini-map mute buttons into one

3 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b535237..2c5dffe 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-10-13 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Combine the two mini-map mute buttons into one.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          
+          
         * Parcel highlighting when selecting a name in radar is less buggy.
         
           modified:   linden/indra/newview/llfloatermap.cpp
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 256c52e..31e57a0 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -520,10 +520,21 @@ void LLFloaterMap::toggleButtons()
         childSetEnabled("freeze_btn", enable_estate);
         childSetEnabled("eject_btn", enable_estate);
         childSetEnabled("mute_btn", enable);
-        childSetEnabled("unmute_btn", enable_unmute);
         childSetEnabled("ar_btn", enable);
         childSetEnabled("estate_eject_btn", enable_estate);
 
+        if (enable_unmute)
+        {
+                childSetVisible("mute_btn", false);
+                childSetEnabled("unmute_btn", true);
+                childSetVisible("unmute_btn", true);
+        }
+        else
+        {
+                childSetVisible("mute_btn", true);
+                childSetVisible("unmute_btn", false);
+        }
+
 // [RLVa:KB] - Imprudence-1.2.0
         // Bit clumsy, but this way the RLV stuff is in its own separate block and keeps the code above clean - Kitty
         if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3c860e9..57f955f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -70,7 +70,7 @@
         <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
              left_delta="0" name="mute_btn"
              tool_tip="" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Unmute..."
+        <button bottom_delta="0" follows="top|right" height="22" label="Unmute..."
              left_delta="0" name="unmute_btn"
              tool_tip="" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Report..."