From 16aeb08d5e7bab90afdf2c838dd26481276bf854 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 3 Feb 2014 13:54:38 +0100
Subject: [PATCH] FIRE-1845: Customizable minimap background transparency

---
 indra/newview/app_settings/settings.xml       | 20 +++++++++++++++++
 indra/newview/llfloatermap.cpp                |  9 ++++++++
 indra/newview/llfloatermap.h                  |  3 +++
 .../xui/de/panel_preferences_colors.xml       |  4 +---
 .../skins/default/xui/en/floater_map.xml      |  4 ++--
 .../xui/en/panel_preferences_colors.xml       | 22 +++++++++++++++++--
 .../skins/starlight/xui/en/floater_map.xml    |  5 ++---
 .../skins/starlightcui/xui/en/floater_map.xml |  2 +-
 .../skins/vintage/xui/en/floater_map.xml      |  4 ++--
 9 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7e86d018eb..f3bb8791b1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21770,6 +21770,26 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSMiniMapOpacity</key>
+      <map>
+      <key>Comment</key>
+      <string>The opacity for the minimap background</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.66</real>
+      <key>SanityCheckType</key>
+      <string>Between</string>
+      <key>SanityValue</key>
+      <array>
+        <real>0.0</real>
+        <real>1.0</real>
+      </array>
+      <key>SanityComment</key>
+      <string>Setting this value lower than 0.0 or higher than 1.0 has no effect.</string>
+    </map>
 </map>
 </llsd>
 
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index cec111ae83..8cc7499621 100755
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -507,3 +507,12 @@ void LLFloaterMap::refreshParcelOverlay()
 {
 	mMap->mUpdateParcelImage = true;
 }
+
+// <FS:Ansariel> FIRE-1825: Minimap floater background transparency
+// virtual
+F32 LLFloaterMap::getCurrentTransparency()
+{
+	static LLCachedControl<F32> fsMiniMapOpacity(gSavedSettings, "FSMiniMapOpacity");
+	return fsMiniMapOpacity();
+}
+
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
index db598cbb37..6876d74976 100755
--- a/indra/newview/llfloatermap.h
+++ b/indra/newview/llfloatermap.h
@@ -50,6 +50,9 @@ public:
 	/*virtual*/ void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ void	draw();
 
+	// <FS:Ansariel> FIRE-1825: Minimap floater background transparency
+	/*virtual*/ F32 getCurrentTransparency();
+
 private:
 	void handleZoom(const LLSD& userdata);
 	void handleStopTracking (const LLSD& userdata);
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
index 82997fbc51..71d5c079ee 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
@@ -139,9 +139,7 @@
 			</panel>
 		</panel>
 		<panel label="Mini-Karte" name="tab-minimap">
-			<text name="netmap_color_textbox">
-				Mini-Karte:
-			</text>
+			<slider name="FSMiniMapOpacity" label="Hintergrund-Deckkraft:" label_width="130" width="430"/>
 			<text name="netmap_dots_textbox">
 				Punkte auf Minikarte:
 			</text>
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 27b497813a..e18a14e737 100755
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="none"
- bg_alpha_image_overlay="DkGray_66"
+ bg_alpha_image_overlay="DkGray"
  legacy_header_height="0"
  can_minimize="true" 
  can_resize="true"
@@ -30,7 +30,7 @@
 	Mini-map
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
+     bg_color="Transparent"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 8a3e9def48..f04252cc6d 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1163,7 +1163,25 @@
      right="-1"
      follows="all"
      label="Minimap"
-     name="tab-minimap" >
+     name="tab-minimap">
+     <slider
+       can_edit_text="false"
+       control_name="FSMiniMapOpacity"
+       decimal_digits="2"
+       follows="left|top"
+       height="16"
+       increment="0.01"
+       initial_value="1.0"
+       layout="topleft"
+       label_width="115"
+       label="Background opacity:"
+       left="30"
+       max_val="1.00"
+       min_val="0.00"
+       name="FSMiniMapOpacity"
+       show_text="true"
+       top_pad="16"
+       width="415" />
      <text
        type="string"
        length="1"
@@ -1413,7 +1431,7 @@
        width="95">
        Shout range
      </text>
-     
+
 	 </panel>
    <!-- Misc Panel -->
    <panel
diff --git a/indra/newview/skins/starlight/xui/en/floater_map.xml b/indra/newview/skins/starlight/xui/en/floater_map.xml
index 2565cff8b6..b7ba4ccca7 100644
--- a/indra/newview/skins/starlight/xui/en/floater_map.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_map.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="none"
- bg_alpha_image_overlay="DkGray_66"
- bg_alpha_color="SL-Background_86"
+ bg_alpha_image_overlay="DkGray"
  legacy_header_height="0"
  can_minimize="true" 
  can_resize="true"
@@ -33,7 +32,7 @@
 	MINIMAP
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
+     bg_color="Transparent"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_map.xml b/indra/newview/skins/starlightcui/xui/en/floater_map.xml
index e989a8c6cc..4fcb355201 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_map.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_map.xml
@@ -31,7 +31,7 @@
 	MINIMAP
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
+     bg_color="Transparent"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
diff --git a/indra/newview/skins/vintage/xui/en/floater_map.xml b/indra/newview/skins/vintage/xui/en/floater_map.xml
index 43887b0a49..00bebc1839 100644
--- a/indra/newview/skins/vintage/xui/en/floater_map.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- background_visible="false"
+ bg_alpha_image_overlay="White"
  legacy_header_height="0"
  can_minimize="false" 
  can_resize="true"
@@ -31,7 +31,7 @@
 	MINIMAP
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
+     bg_color="Transparent"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"