From c1406b1fd75d51dbbb0ede7e8c9a5597566d639b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 1 Oct 2024 13:30:54 +0200
Subject: [PATCH] Remove minimap option to render worldmap tiles - old terrain
 rendering has been changed to world tiles by LL; leave old tiles code in
 place and use it because the LL code currently still has bugs

---
 indra/newview/app_settings/settings.xml       |  2 +-
 .../skins/default/xui/az/menu_mini_map.xml    |  2 --
 .../skins/default/xui/de/menu_mini_map.xml    |  2 --
 .../skins/default/xui/en/menu_mini_map.xml    | 21 -------------------
 .../skins/default/xui/es/menu_mini_map.xml    |  2 --
 .../skins/default/xui/fr/menu_mini_map.xml    |  2 --
 .../skins/default/xui/it/menu_mini_map.xml    |  2 --
 .../skins/default/xui/ja/menu_mini_map.xml    |  2 --
 .../skins/default/xui/pl/menu_mini_map.xml    |  2 --
 .../skins/default/xui/ru/menu_mini_map.xml    |  2 --
 10 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ee53c5a2e5..f70fab11c0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8461,7 +8461,7 @@
       <key>Comment</key>
       <string>Use the world map texture tile on the mini-map rather than the terrain texture</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
diff --git a/indra/newview/skins/default/xui/az/menu_mini_map.xml b/indra/newview/skins/default/xui/az/menu_mini_map.xml
index a04570e89c..3bb8c2cbc6 100644
--- a/indra/newview/skins/default/xui/az/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/az/menu_mini_map.xml
@@ -52,8 +52,6 @@
 		<menu_item_check label="Müvəqqəti obyektlər" name="Temp On Rez Objects"/>
 		<menu_item_check label="Sahə sərhədləri" name="Property Lines"/>
 		<menu_item_check label="Satılan sahələr" name="Parcels for Sale"/>
-		<menu_item_check label="Torpaq teksturları" name="Terrain Textures"/>
-		<menu_item_check label="Dünya xəritəsinin teksturları" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Şimal yuxarıda" name="North at top"/>
 	<menu_item_check label="Kamera yuxarıda" name="Camera at top"/>
diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml
index 2b9e01a7fe..faa8b66924 100644
--- a/indra/newview/skins/default/xui/de/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml
@@ -52,8 +52,6 @@
 		<menu_item_check label="Temporäre Objekte" name="Temp On Rez Objects"/>
 		<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
 		<menu_item_check label="Land zum Verkauf" name="Parcels for Sale"/>
-		<menu_item_check label="Terrain-Texturen" name="Terrain Textures"/>
-		<menu_item_check label="Weltkarten-Texturen" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Norden oben" name="North at top"/>
 	<menu_item_check label="Kamera oben" name="Camera at top"/>
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index d645f29046..2060a82eb0 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -385,27 +385,6 @@
       <menu_item_check.on_enable
        control="MiniMapShowPropertyLines" />
     </menu_item_check>
-    <menu_item_separator />
-    <menu_item_check
-     label="Terrain Textures"
-     name="Terrain Textures">
-      <menu_item_check.on_click
-       function="Minimap.TextureType"
-       parameter="terrain" />
-      <menu_item_check.on_check
-       function="Minimap.CheckTextureType"
-       parameter="terrain" />
-    </menu_item_check>
-    <menu_item_check
-     label="World Map Textures"
-     name="World Map Textures">
-      <menu_item_check.on_click
-       function="Minimap.TextureType"
-       parameter="maptile" />
-      <menu_item_check.on_check
-       function="Minimap.CheckTextureType"
-       parameter="maptile" />
-    </menu_item_check>
   </menu>
     <menu_item_check
        label="North at top"
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
index cbb18a1a8c..d9a44a978d 100644
--- a/indra/newview/skins/default/xui/es/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml
@@ -25,8 +25,6 @@
 		<menu_item_check label="Objetos temporales" name="Temp On Rez Objects"/>
 		<menu_item_check label="Lindes" name="Property Lines"/>
 		<menu_item_check label="Parcelas en venta" name="Parcels for Sale"/>
-		<menu_item_check label="Texturas del terreno" name="Terrain Textures"/>
-		<menu_item_check label="Texturas del mapa mundial" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Girar el mapa" name="Rotate Map"/>
 	<menu_item_check label="Centrar automáticamente" name="Auto Center"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
index 691fc0e922..77bd453918 100644
--- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
@@ -52,8 +52,6 @@
 		<menu_item_check label="État temporaire des objets" name="Temp On Rez Objects"/>
 		<menu_item_check label="Limites de terrain" name="Property Lines"/>
 		<menu_item_check label="Terrains à Vendre" name="Parcels for Sale"/>
-		<menu_item_check label="Textures du terrain" name="Terrain Textures"/>
-		<menu_item_check label="Textures de la carte" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Nord en haut" name="North at top" />
 	<menu_item_check label="Caméra en haut" name="Camera at top" />
diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml
index 389ed1d092..d3c00df65f 100644
--- a/indra/newview/skins/default/xui/it/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/it/menu_mini_map.xml
@@ -52,8 +52,6 @@
 		<menu_item_check label="Oggetti temporanei" name="Temp On Rez Objects"/>
 		<menu_item_check label="Linee di proprietà" name="Property Lines"/>
 		<menu_item_check label="Terreni in vendita" name="Parcels for Sale"/>
-		<menu_item_check label="Texture terreno" name="Terrain Textures"/>
-		<menu_item_check label="Texture mappa del mondo" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Nord in alto" name="North at top" />
 	<menu_item_check label="Camera in alto" name="Camera at top" />
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 9750dc4b24..d8d635cb11 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -62,8 +62,6 @@
 		<menu_item_check label="境界線" name="Property Lines" />
 		<menu_item_check label="売り地" name="Parcels for Sale" />
 		<menu_item_separator />
-		<menu_item_check label="地面のテクスチャ" name="Terrain Textures" />
-		<menu_item_check label="世界地図のテクスチャ" name="World Map Textures" />
 	</menu>
 	<menu_item_check label="地図を回転" name="Rotate Map"/>
 	<menu_item_check label="中央へ自動移動" name="Auto Center"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
index ffee24fa35..2dc631d806 100644
--- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
@@ -52,8 +52,6 @@
 		<menu_item_check label="Obiekty zrezzowane tymczasowo" name="Temp On Rez Objects"/>
 		<menu_item_check label="Granice działek" name="Property Lines"/>
 		<menu_item_check label="Działki na sprzedaż" name="Parcels for Sale"/>
-		<menu_item_check label="Tekstury terenu" name="Terrain Textures"/>
-		<menu_item_check label="Tekstury mapy świata" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Północ na górze" name="North at top" />
 	<menu_item_check label="Kamera na górze" name="Camera at top" />
diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
index 7af4a9f1d0..082d854931 100644
--- a/indra/newview/skins/default/xui/ru/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
@@ -52,8 +52,6 @@
 		<menu_item_check label="Временные объекты" name="Temp On Rez Objects"/>
 		<menu_item_check label="Границы участка" name="Property Lines"/>
 		<menu_item_check label="Участки на продажу" name="Parcels for Sale"/>
-		<menu_item_check label="Текстуры земли" name="Terrain Textures"/>
-		<menu_item_check label="Текстуры карты мира" name="World Map Textures"/>
 	</menu>
 	<menu_item_check label="Север вверху" name="North at top"/>
 	<menu_item_check label="Камера вверху" name="Camera at top"/>