From 28f0ce150621252a5607437501838506e74e9e03 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 26 Jul 2016 20:51:47 +0200
Subject: [PATCH] Adjust opening of UI scaling preferences for Firestorm

---
 indra/newview/llviewerwindow.cpp                          | 8 +++++++-
 .../newview/skins/default/xui/de/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/en/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/es/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/fr/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/it/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/ja/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/pl/floater_preferences.xml  | 2 +-
 .../newview/skins/default/xui/ru/floater_preferences.xml  | 2 +-
 .../skins/starlightcui/xui/de/floater_preferences.xml     | 2 +-
 .../skins/starlightcui/xui/en/floater_preferences.xml     | 2 +-
 .../skins/starlightcui/xui/es/floater_preferences.xml     | 2 +-
 .../skins/starlightcui/xui/pl/floater_preferences.xml     | 2 +-
 .../newview/skins/vintage/xui/en/floater_preferences.xml  | 2 +-
 14 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 3743778fc4..2eae87250a 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1970,7 +1970,13 @@ bool LLViewerWindow::onSystemUIScaleFactorChanged(const LLSD& notification, cons
 		LLFloaterReg::toggleInstanceOrBringToFront("preferences");
 		LLFloater* pref_floater = LLFloaterReg::getInstance("preferences");
 		LLTabContainer* tab_container = pref_floater->getChild<LLTabContainer>("pref core");
-		tab_container->selectTabByName("advanced1");
+		// <FS:Ansariel> Adjusted for Firestorm
+		//tab_container->selectTabByName("advanced1");
+		tab_container->selectTabByName("ui");
+		LLPanel* ui_panel = tab_container->getCurrentPanel();
+		LLTabContainer* ui_tab_container = ui_panel->getChild<LLTabContainer>("tabs");
+		ui_tab_container->selectTabByName("ui-2d-overlay");
+		// </FS:Ansariel>
 
 	}
 	return false; 
diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
index 415895f2d4..4601050536 100644
--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -19,7 +19,7 @@
 		<panel label="Meldungen" name="msgs"/>
 		<panel label="Privatsphäre" name="im"/>
 		<panel label="Erweitert" name="advanced1"/>
-		<panel label="Benutzerinterface" name="starlightUI1"/>
+		<panel label="Benutzerinterface" name="ui"/>
 		<panel label="Oberflächendesign" name="skins"/>
 		<panel label="Absturzmeldungen" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 849d549d60..bf7e0f7df0 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -168,7 +168,7 @@
          label="User Interface"
          layout="topleft"
          help_topic="preferences_ui_extras_tab"
-         name="starlightUI1" />
+         name="ui" />
         <panel
          class="panel_preference_skins"
          filename="panel_preferences_skins.xml"
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index 8736f251f7..8c54863718 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -15,7 +15,7 @@
 		<panel label="Privacidad" name="im"/>
 		<panel label="Avanzado" name="advanced1"/>
 		<panel label="Ortografía" name="spell_check"/>
-		<panel label="Interfaz" name="starlightUI1"/>
+		<panel label="Interfaz" name="ui"/>
 		<panel label="Skins" name="skins"/>
 		<panel label="Reporte de fallos" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index 022e07f706..6dd184509e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -16,7 +16,7 @@
 		<panel label="Notifications" name="msgs"/>
 		<panel label="Confidentialité" name="im"/>
 		<panel label="Avancés" name="advanced1"/>
-		<panel label="Interface" name="starlightUI1"/>
+		<panel label="Interface" name="ui"/>
 		<panel label="Thèmes" name="skins"/>
 		<panel label="Rapports d'erreurs" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index 2d737aa1ad..24ca399c18 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
@@ -14,7 +14,7 @@
 		<panel label="Riservatezza" name="im"/>
 		<panel label="Impostazione" name="input"/>
 		<panel label="Avanzate" name="advanced1"/>
-		<panel label="Interfaccia" name="starlightUI1"/>
+		<panel label="Interfaccia" name="ui"/>
 		<panel label="Segnala Crash" name="crashreports" />
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 9e23f29da6..a00b3b8353 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -17,7 +17,7 @@
 		<panel label="通知" name="msgs"/>
 		<panel label="プライバシー" name="im"/>
 		<panel label="アドバンス" name="advanced1"/>
-		<panel label="UI" name="starlightUI1"/>
+		<panel label="UI" name="ui"/>
 		<panel label="スキン" name="skins"/>
 		<panel label="レポート" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
index 7fc89dc0a9..f2267e7d22 100644
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -18,7 +18,7 @@
 		<panel label="Powiadomienia" name="msgs"/>
 		<panel label="Prywatność" name="im"/>
 		<panel label="Zaawansowane" name="advanced1"/>
-		<panel label="Interfejs" name="starlightUI1"/>
+		<panel label="Interfejs" name="ui"/>
 		<panel label="Skórki" name="skins"/>
 		<panel label="Błędy" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml
index 101ce6cfa8..cd053f60d8 100644
--- a/indra/newview/skins/default/xui/ru/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences.xml
@@ -19,7 +19,7 @@
 		<panel label="Уведомления" name="msgs"/>
 		<panel label="Приватность" name="im"/>
 		<panel label="Расширеное" name="advanced1"/>
-		<panel label="Интерфейс" name="starlightUI1"/>
+		<panel label="Интерфейс" name="ui"/>
 		<panel label="Темы" name="skins"/>
 		<panel label="Ошибки" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
index 00a107960c..319014d303 100644
--- a/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
@@ -20,7 +20,7 @@
 		<panel label="Meldungen" name="msgs"/>
 		<panel label="Privatsphäre" name="im"/>
 		<panel label="Erweitert" name="advanced1"/>
-		<panel label="Benutzerinterface" name="starlightUI1"/>
+		<panel label="Benutzerinterface" name="ui"/>
 		<panel label="Oberflächendesign" name="skins"/>
 		<panel label="Firestorm" name="firestorm"/>
 		<panel label="OpenSim" name="opensim"/>
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
index d4812433c1..71268f67a3 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
@@ -175,7 +175,7 @@
          label="User Interface"
          layout="topleft"
          help_topic="preferences_ui_extras_tab"
-         name="starlightUI1" />
+         name="ui" />
         <panel
          class="panel_preference_skins"
          filename="panel_preferences_skins.xml"
diff --git a/indra/newview/skins/starlightcui/xui/es/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/es/floater_preferences.xml
index 0e3f086d24..145e445140 100644
--- a/indra/newview/skins/starlightcui/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/es/floater_preferences.xml
@@ -18,7 +18,7 @@
 		<panel label="Notificaciones" name="msgs"/>
 		<panel label="Privacidad" name="im"/>
 		<panel label="Avanzado" name="advanced1"/>
-		<panel label="Interfaz" name="starlightUI1"/>
+		<panel label="Interfaz" name="ui"/>
 		<panel label="Skins" name="skins"/>
 		<panel label="Reporte de fallos" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
index 156f7e5fd6..f849bc12e4 100644
--- a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
@@ -20,7 +20,7 @@
 		<panel label="Powiadomienia" name="msgs"/>
 		<panel label="Prywatność" name="im"/>
 		<panel label="Zaawansowane" name="advanced1"/>
-		<panel label="Interfejs" name="starlightUI1"/>
+		<panel label="Interfejs" name="ui"/>
 		<panel label="Skórki" name="skins"/>
 		<panel label="Błędy" name="crashreports"/>
 		<panel label="Firestorm" name="firestorm"/>
diff --git a/indra/newview/skins/vintage/xui/en/floater_preferences.xml b/indra/newview/skins/vintage/xui/en/floater_preferences.xml
index 9922356c41..35ba20c873 100644
--- a/indra/newview/skins/vintage/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_preferences.xml
@@ -157,7 +157,7 @@
          label="User Interface"
          layout="topleft"
          help_topic="preferences_ui_extras_tab"
-         name="starlightUI1" />
+         name="ui" />
         <panel
          class="panel_preference_skins"
          filename="panel_preferences_skins.xml"