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
Value
0
+ FSMiniMapOpacity
+
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;
}
+
+// FIRE-1825: Minimap floater background transparency
+// virtual
+F32 LLFloaterMap::getCurrentTransparency()
+{
+ static LLCachedControl 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();
+ // 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 @@
-
- Mini-Karte:
-
+
Punkte auf Minikarte:
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 @@
+ name="tab-minimap">
+
Shout range
-
+