From 8dc785c484640de5df01ac95ed8f7619eafa49bb Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 22 Apr 2022 10:59:08 +0200
Subject: [PATCH] Starlight? Wat dat?

---
 indra/newview/app_settings/settings.xml               |  2 +-
 indra/newview/llmoveview.cpp                          |  2 +-
 indra/newview/skins/default/textures/textures.xml     | 11 ++++-------
 .../skins/default/xui/en/floater_world_map.xml        |  4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ec4d674428..a4b00ffbe9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20974,7 +20974,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <real>0.0</real>
     </map>
-    <key>StarLightShowMapDetails</key>
+    <key>FSShowMapDetails</key>
     <map>
       <key>Comment</key>
       <string>Show the details panel on the side of the World Map</string>
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 6be25911db..1912e15bf5 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -691,7 +691,7 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view)
 
 		// Attach to movement controls.
 		parent->removeChild(this);
-		// <FS:Ansariel> FIRE-9636: Resizable movement controls (for all skins except Starlight/CUI)
+		// <FS:Ansariel> FIRE-9636: Resizable movement controls
 		//move_view->addChild(this);
 		LLView* modes_container = move_view->findChildView("modes_container");
 		if (modes_container)
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index db4cf03569..704b60dc7e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1015,16 +1015,13 @@ with the same filename but different name
   <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
   <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true"/>
   <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true"/>
-  
-<!-- StarLight Textures -->
-
-  <texture name="SpeakBtn_Left_Selected_Press" file_name="widgets/SpeakBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
-  <texture name="SpeakBtn_Left_Off" file_name="widgets/SpeakBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
-  <texture name="SpeakBtn_Right_Selected_Press" file_name="widgets/SpeakBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
-  <texture name="SpeakBtn_Right_Off" file_name="widgets/SpeakBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 
 <!-- Firestorm Textures -->
 
+<texture name="SpeakBtn_Left_Selected_Press" file_name="widgets/SpeakBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+<texture name="SpeakBtn_Left_Off" file_name="widgets/SpeakBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+<texture name="SpeakBtn_Right_Selected_Press" file_name="widgets/SpeakBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+<texture name="SpeakBtn_Right_Off" file_name="widgets/SpeakBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 <texture name="profile_icon_24x24" file_name="icons/profile_icon_24x24.png" preload="false" />
 <texture name="sale_icon_24x24" file_name="icons/sale_icon_24x24.png" preload="false" />
 <texture name="call_icon_24x24" file_name="icons/call_icon_24x24.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 81cd4507d7..6f103049aa 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -104,7 +104,7 @@
     />
 
     <button
-     control_name="StarLightShowMapDetails"
+     control_name="FSShowMapDetails"
      follows="all"
      height="512"
      image_unselected="Arrow_Left_Unscaled"
@@ -128,7 +128,7 @@
    left_delta="0"
    min_width="258"
    height="512"
-   visibility_control="StarLightShowMapDetails"
+   visibility_control="FSShowMapDetails"
    auto_resize="false"
    name="map_details_panel">
    <panel