Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

indra/cmake/Variables.cmake

@@ -217,8 +217,12 @@ set(FLICKR_API_SECRET "846f0958020b553e")
 # Discord client key.
 set(DDISCORD_API_KEY "427641535253708801")
 
-set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
-set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
+# FS:ND Don't force this into the cache, that can have some strange effects. Instead make it a normal variable
+#set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
+set(ENABLE_SIGNING OFF)
+
+# FS:ND Don't force this into the cache here, we set it in 00-Common.make 
+#set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
 
 set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(USESYSTEMLIBS OFF CACHE BOOL "Use libraries from your system rather than Linden-supplied prebuilt libraries.")

indra/newview/app_settings/settings.xml

@@ -21053,7 +21053,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <real>0.0</real>
     </map>
-    <key>FSShowMapDetails</key>
+    <key>StarLightShowMapDetails</key>
     <map>
       <key>Comment</key>
       <string>Show the details panel on the side of the World Map</string>
@@ -24651,6 +24651,19 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSLatencyOneTimeFixRun</key>
+    <map>
+        <key>Comment</key>
+        <string>One time fix has run for this install for script dialog colors on Latency</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>HideFromEditor</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
     <key>FSUseCtrlShout</key>
     <map>
       <key>Comment</key>

indra/newview/app_settings/settings_v3.xml

@@ -80,7 +80,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>firestorm</string>
+    <string>starlight</string>
   </map>
 
   <key>SkinCurrentTheme</key>
@@ -106,7 +106,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>Firestorm</string>
+    <string>Starlight</string>
   </map>
 
   <key>FSSkinCurrentThemeReadableName</key>

indra/newview/fsfloaterim.cpp

@@ -411,7 +411,14 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type)
 					static LLCachedControl<std::string> FSInternalSkinCurrent(gSavedSettings, "FSInternalSkinCurrent");
 					std::string skin_indicator(FSInternalSkinCurrent);
 					LLStringUtil::toLower(skin_indicator);
-					skin_indicator = skin_indicator.substr(0, 1); // "FS 4.4.1f os", "FS 4.4.1v", "FS 4.4.1a", "FS 4.4.1s os", "FS 4.4.1m os" etc.
+					if (skin_indicator == "starlight cui")
+					{
+						skin_indicator = "sc"; // Separate "s" (StarLight) from "sc" (StarLight CUI)
+					}
+					else
+					{
+						skin_indicator = skin_indicator.substr(0, 1); // "FS 4.4.1f os", "FS 4.4.1v", "FS 4.4.1a", "FS 4.4.1s os", "FS 4.4.1m os" etc.
+					}
 					// </FS:PP>
 					
 					//Address size check

indra/newview/llfloaterpreference.cpp

@@ -5157,6 +5157,34 @@ void LLPanelPreferenceSkins::apply()
 			gSavedSettings.setBOOL("ResetToolbarSettings", TRUE);
 		}
 
+		if (m_Skin == "starlight" || m_Skin == "starlightcui")
+		{
+			std::string noteMessage;
+
+			if (gSavedSettings.getBOOL("ShowMenuBarLocation"))
+			{
+				noteMessage = LLTrans::getString("skin_defaults_starlight_location");
+				gSavedSettings.setBOOL("ShowMenuBarLocation", FALSE);
+			}
+
+			if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
+			{
+				if (!noteMessage.empty())
+				{
+					noteMessage += "\n";
+				}
+				noteMessage += LLTrans::getString("skin_defaults_starlight_navbar");
+				gSavedSettings.setBOOL("ShowNavbarNavigationPanel", TRUE);
+			}
+
+			if (!noteMessage.empty())
+			{
+				LLSD args;
+				args["MESSAGE"] = noteMessage;
+				LLNotificationsUtil::add("SkinDefaultsChangeSettings", args, LLSD(), boost::bind(&LLPanelPreferenceSkins::showSkinChangeNotification, this));
+				return;
+			}
+		}
 		// </FS:AO>
 
 		showSkinChangeNotification();

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
+		// <FS:Ansariel> FIRE-9636: Resizable movement controls (for all skins except Starlight/CUI)
 		//move_view->addChild(this);
 		LLView* modes_container = move_view->findChildView("modes_container");
 		if (modes_container)

indra/newview/skins/default/textures/textures.xml

@@ -838,6 +838,14 @@ with the same filename but different name
   <texture name="skin metaharper modern coolocean" file_name="skinspreview/meta_coolocean.jpg" preload="true" />
   <texture name="skin metaharper modern appalachiansky" file_name="skinspreview/meta_appalachia.jpg" preload="true" />
   <texture name="skin metaharper modern blackglass" file_name="skinspreview/meta_blackglass.jpg" preload="true" />
+  <texture name="skin starlight original orange" file_name="skinspreview/slight_orange.jpg" preload="true" />
+  <texture name="skin starlight original teal" file_name="skinspreview/slight_teal.jpg" preload="true" />
+  <texture name="skin starlight mono teal" file_name="skinspreview/slight_mteal.jpg" preload="true" />
+  <texture name="skin starlight nostalgia blue" file_name="skinspreview/slight_nblue.jpg" preload="true" />
+  <texture name="skin starlight silver blue" file_name="skinspreview/slight_sblue.jpg" preload="true" />
+  <texture name="skin starlight silver pink" file_name="skinspreview/slight_spink.jpg" preload="true" />
+  <texture name="skin starlight cui custom dark" file_name="skinspreview/scui_dark.jpg" preload="true" />
+  <texture name="skin starlight cui custom light" file_name="skinspreview/scui_light.jpg" preload="true" />
   <texture name="skin vintage classic" file_name="skinspreview/vintage_classic.jpg" preload="true" />
   
   <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
@@ -1014,13 +1022,16 @@ 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" />

indra/newview/skins/default/xui/de/floater_about.xml

@@ -36,6 +36,8 @@ Zusätzlicher Programmcode von:
 Besonderer Dank gilt unserem Firestorm-Support-Team sowie den Wiki-Autoren, Schulungsleitern und Übersetzern:
 					</text>
 					<text name="fs_art_intro" >
+Firestorm enthält Starlight, modifiziert für Firestorm. Es ist von Einwohnern für Einwohner und hat das Ziel, eine alternative, freundlichere und hoffentlich einfacher zu bedienende Oberfläche bereitzustellen. Für weitere Details, siehe &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
+
 UI-Künstler und Designer:
 					</text>
 				</panel>

indra/newview/skins/default/xui/de/strings.xml

@@ -7052,6 +7052,13 @@ Ihre aktuelle Position: [AVATAR_POS]
 		Achtung: Präprozessor-Ausgabe wurde aufgrund exzessiver Textlänge gekürzt. Das Skript wird wahrscheinlich nicht funktionieren.
 	</string>
 
+	<string name="skin_defaults_starlight_location">
+		Die Anzeige der aktuellen Position in der Menüleiste wurde als Standard für Starlight-Oberflächendesigns deaktiviert.
+	</string>
+	<string name="skin_defaults_starlight_navbar">
+		Die Anzeige der Navigationsleiste wurde als Standard für Starlight-Oberflächendesigns aktiviert.
+	</string>
+
 	<string name="animation_explorer_seconds_ago">
 		Vor [SECONDS] Sekunden
 	</string>

indra/newview/skins/default/xui/en/floater_about.xml

@@ -201,6 +201,8 @@ Afrika Burton, Albatroz Hird, Alexru Resident, alison Seesaw, AnaLucia Loon, Ang
                  top_pad="8"
                  width="450"
                  wrap="true">
+Firestorm includes Starlight, modified for Firestorm. It is provided by residents for residents, with the intention of providing an alternative, brighter, and hopefully easier to use interface. For further details see <nolink>https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight</nolink>.
+
 UI Artists and Designers:
                 </text>
                 <text

indra/newview/skins/default/xui/en/floater_world_map.xml

@@ -104,7 +104,7 @@
     />
 
     <button
-     control_name="FSShowMapDetails"
+     control_name="StarLightShowMapDetails"
      follows="all"
      height="512"
      image_unselected="Arrow_Left_Unscaled"
@@ -128,7 +128,7 @@
    left_delta="0"
    min_width="258"
    height="512"
-   visibility_control="FSShowMapDetails"
+   visibility_control="StarLightShowMapDetails"
    auto_resize="false"
    name="map_details_panel">
    <panel

indra/newview/skins/default/xui/en/strings.xml

@@ -3162,6 +3162,10 @@ Your current position: [AVATAR_POS]
   <string name="fs_preprocessor_truncated">Warning: Preprocessor output truncated due to excessive script text size. This script will most likely not work.</string>
   <!-- </FS:Cron> -->
 
+  <!-- <FS:Zi> Notify user about preferences settings changes to skin defaults -->
+  <string name="skin_defaults_starlight_location">Showing your current location in the menu bar was disabled as a default for the Starlight skin series.</string>
+  <string name="skin_defaults_starlight_navbar">Showing the navigation bar was enabled as a default for the Starlight skin series.</string>
+
   <!-- Animation Explorer -->
   <string name="animation_explorer_seconds_ago">[SECONDS] seconds ago</string>
   <string name="animation_explorer_still_playing">Still playing</string>

indra/newview/skins/default/xui/es/floater_about.xml

@@ -75,6 +75,8 @@ Forman el Equipo de Desarrollo de Firestorm:
 						Agradecimientos especiales para nuestro Equipo de Soporte de Firestorm, editores del wiki, educadores, y traductores:
 					</text>
 					<text name="fs_art_intro" >
+						Firestorm incluye Starlight, modificado por Firestorm. Proporcionado por residentes para los residentes, con la intención de proveer una interfaz de uso alternativa, más luminosa y esperamos que más fácil de usar. Para más detalles ver &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
+
 Artistas y Diseñadores de la interfaz:
 					</text>
 				</panel>

indra/newview/skins/default/xui/es/panel_main_inventory.xml

@@ -41,6 +41,14 @@
 		<panel name="new_inventory_panel">
 			<button name="new_inv_btn" tool_tip="Ventana de inventario adicional"/>
 		</panel>
+		<!-- Used by StarLight skins -->
+		<panel name="collapse_panel">
+			<button label="Contraer" name="collapse_btn" tool_tip="Contraer todas las carpetas"/>
+		</panel>
+		<panel name="expand_panel">
+			<button label="Expandir" name="expand_btn" tool_tip="Expandir todas las carpetas"/>
+		</panel>
+		<!-- / Used by StarLight skins -->
 		<panel name="dummy_panel">
 			<text name="ItemcountText">
 				Items

indra/newview/skins/default/xui/es/strings.xml

@@ -6111,6 +6111,12 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="TotalScriptCountChangeIncrease">El total de scripts en la región ha subido de [OLD_VALUE] a [NEW_VALUE] ([DIFFERENCE]).</string>
 	<string name="TotalScriptCountChangeDecrease">El total de scripts en la región ha bajado de [OLD_VALUE] a [NEW_VALUE] ([DIFFERENCE]).</string>
 	<string name="preproc_toggle_warning">La conmutación del preprocesador no será efectiva hasta que no cierres y reabras este editor.</string>
+	<string name="skin_defaults_starlight_location">
+		Mostrar tu localizacion actual en la barra de menú ha sido desactivado como opción por defecto en la serie de skins Starlight.
+	</string>
+	<string name="skin_defaults_starlight_navbar">
+		Mostrar la barra de navegación ha sido activado como opción por defecto en la serie de skins Starlight.
+	</string>
 	<string name="animation_explorer_seconds_ago">
 		Hace [SECONDS] segundos
 	</string>

indra/newview/skins/default/xui/fr/floater_about.xml

@@ -25,7 +25,10 @@
 					</text>
 					<text name="fs_contrib_intro">Code additionnel pour Firestorm généreusement fourni par :</text>
 					<text name="fs_support_intro">Remerciements particuliers à notre équipe d'aide Firestorm, aux contributeurs wiki, éducateurs et traducteurs :</text>
-					<text name="fs_art_intro">Création de l'interface :</text>
+					<text name="fs_art_intro" height="70">
+ Firestorm intègre Starlight modifié pour Firestorm, développé par des résidents pour les résidents, dans le but d'offrir une interface alternative, plus claire et avec de la chance, plus simple à utiliser. Pour plus de détails, consulter &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;
+ Création de l'interface :
+					</text>
 				</panel>
 			</scroll_container>
 		</panel>

indra/newview/skins/default/xui/fr/strings.xml

@@ -6897,6 +6897,14 @@ Votre position actuelle : [AVATAR_POS]
 	</string>
 	<!-- </FS:Cron> -->
 
+	<!-- <FS:Zi> Notify user about preferences settings changes to skin defaults -->
+	<string name="skin_defaults_starlight_location">
+		L'affichage de votre position actuelle dans la barre de menu a été désactivé par défaut pour la série de skin Starlight.
+	</string>
+	<string name="skin_defaults_starlight_navbar">
+		L'affichage de la barre de navigation a été activé par défaut pour la série de skin Starlight.
+	</string>
+
 	<!-- Animation Explorer -->
 	<string name="animation_explorer_seconds_ago">
 		[SECONDS] plus tôt

indra/newview/skins/default/xui/it/panel_main_inventory.xml

@@ -49,6 +49,12 @@
 		<panel name="new_inventory_panel">
 			<button name="new_inv_btn" tool_tip="Apri una nuova finestra Inventario"/>
 		</panel>
+		<panel name="collapse_panel">
+			<button label="Comprimi" name="collapse_btn" tool_tip="Chiude tutte le cartelle" />
+		</panel>
+		<panel name="expand_panel">
+			<button label="Espandi" name="expand_btn" tool_tip="Apre tutte le cartelle" />
+		</panel>
 		<panel name="dummy_panel">
 			<text name="ItemcountText" tool_tip="[ITEMS] oggetti, [CATEGORIES] cartelle">
 				Elementi

indra/newview/skins/default/xui/it/strings.xml

@@ -6323,6 +6323,12 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
 	<string name="fs_preprocessor_caching_err">
 		Errore nella prelettura del file incluso &apos;[FILENAME]&apos;
 	</string>
+	<string name="skin_defaults_starlight_location">
+		L&apos;indicazione del luogo attuale nella barra menu è disabilitata in modo predefinito nella serie di impostazioni Starlight.
+	</string>
+	<string name="skin_defaults_starlight_navbar">
+		L&apos;attivazione della barra di navigazione è predefinita nella serie di impostazioni Starlight.
+	</string>
 	<string name="animation_explorer_seconds_ago">
 		[SECONDS] secondi fa
 	</string>

indra/newview/skins/default/xui/ja/panel_fs_login.xml

@@ -51,7 +51,12 @@
 			<text name="mode_selection_text">
 				モード選択
 			</text>
-			<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo" />
+			<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
+				<combo_box.item label="Firestorm" name="Firestorm"/>
+				<combo_box.item label="Phoenix" name="Phoenix"/>
+				<combo_box.item label="Hybrid" name="Hybrid"/>
+				<combo_box.item label="Latency" name="Latency"/>
+			</combo_box>
 		</layout_panel>
 	</layout_stack>
 </panel>

indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml

@@ -53,6 +53,7 @@
 								<combo_box.item label="Firestorm" name="Firestorm" />
 								<combo_box.item label="Phoenix" name="Phoenix" />
 								<combo_box.item label="ハイブリッド" name="Hybrid" />
+								<combo_box.item label="Latency" name="Latency" />
 								<combo_box.item label="テキスト" name="Text" />
 							</combo_box>
 						</layout_panel>

indra/newview/skins/default/xui/ja/strings.xml

@@ -6440,7 +6440,11 @@ Secondlife.com のサポートセクションから
 	
 	<!-- <FS:Cron> FIRE-9335 -->
 	<!-- <LSL Preprocessor -->
-
+	
+	<!-- <FS:Zi> Notify user about preferences settings changes to skin defaults -->
+	<string name="skin_defaults_starlight_location">Starlight スキンの初期設定により、メニューバーには現在いる場所が表示されません。</string>
+	<string name="skin_defaults_starlight_navbar">Starlight スキンの初期設定により、ナビゲーションバーが表示されます。</string>
+	
 	<!-- Animation Explorer -->
 	<string name="animation_explorer_seconds_ago">[SECONDS] 秒前</string>
 	<string name="animation_explorer_still_playing">実行中のアニメーション：</string>

indra/newview/skins/default/xui/pl/floater_about.xml

@@ -29,7 +29,9 @@ Zespół programistów Firestorma:
 						Specjalne podziękowania dla naszego zespołu wsparcia, beta testerów, edytorów wiki, nauczycieli i tłumaczy:
 					</text>
 					<text name="fs_art_intro">
-						Artyści i projektanci interfejsu:
+						Firestorm zawiera Starlight, zmodyfikowany dla Firestorma. Jest on tworzony przez rezydentów dla rezydentów, z intencją dostarczenia alternatywnego, jaśniejszego i w założeniach łatwiejszego w użytkowaniu interfejsu. Więcej szczegółów pod &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
+
+Artyści i projektanci interfejsu:
 					</text>
 				</panel>
 			</scroll_container>

indra/newview/skins/default/xui/pl/panel_main_inventory.xml

@@ -49,6 +49,14 @@
 		<panel name="new_inventory_panel">
 			<button name="new_inv_btn" tool_tip="Otwórz dodatkowe okno Szafy"/>
 		</panel>
+		<!-- Used by StarLight skins -->
+		<panel name="collapse_panel">
+			<button label="Zwiń" name="collapse_btn" tool_tip="Zwiń wszystkie foldery" />
+		</panel>
+		<panel name="expand_panel">
+			<button label="Rozwiń" name="expand_btn" tool_tip="Rozwiń wszystkie foldery" />
+		</panel>
+		<!-- / Used by StarLight skins -->
 		<panel name="dummy_panel">
 			<text name="ItemcountText" tool_tip="[ITEMS] przedmiotów, [CATEGORIES] folderów">
 				Elementy

indra/newview/skins/default/xui/pl/strings.xml

@@ -6329,6 +6329,12 @@ Twoja aktualna pozycja: [AVATAR_POS]
 	<string name="fs_preprocessor_caching_err">
 		Błąd podczas buforowania pliku '[FILENAME]'
 	</string>
+	<string name="skin_defaults_starlight_location">
+		Pokazywanie Twojej obecnej lokalizacji w pasku menu zostało wyłączone, to domyślne zachowanie dla skórek linii StarLight.
+	</string>
+	<string name="skin_defaults_starlight_navbar">
+		Pokazywanie paska nawigacyjnego zostało włączone, to domyślne zachowanie dla skórek linii StarLight.
+	</string>
 	<string name="fs_preprocessor_truncated">
 		Uwaga: Dane wyjściowe preprocesora zostały skrócone z powodu zbyt dużego rozmiaru tekstu skryptu - prawdopodobnie nie zadziała.
 	</string>

indra/newview/skins/default/xui/ru/floater_about.xml

@@ -36,7 +36,9 @@ Linden это:
 						Специальные благодарности для команды поддержки, издателей wiki, учителей и переводчиков:
 					</text>
 					<text name="fs_art_intro">
-						Художники и дизайнеры интерфейса:
+						Firestorm использует Starlight, модифицированный для Firestorm. Он создан пользователями для пользователей, с целью предоставления альтернативного, более ясного и в более легкого в использовании интерфейса. Больше подробностей на &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
+
+Художники и дизайнеры интерфейса:
 					</text>
 				</panel>
 			</scroll_container>

indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml

@@ -42,6 +42,7 @@
               <combo_box.item label="Phoenix" name="Phoenix"/>
               <combo_box.item label="[VIEWER_GENERATION]" name="V3"/>
               <combo_box.item label="Hybrid" name="Hybrid"/>
+              <combo_box.item label="Latency" name="Latency"/>
               <combo_box.item label="Text" name="Text"/>
               -->
               </combo_box>

indra/newview/skins/default/xui/ru/panel_main_inventory.xml

@@ -48,6 +48,14 @@
 		<panel name="new_inventory_panel">
 			<button name="new_inv_btn" tool_tip="Дополнительное окно инвентаря"/>
 		</panel>
+		<!-- Used by StarLight skins -->
+		<panel name="collapse_panel">
+			<button label="Свернуть" name="collapse_btn" tool_tip="Свернуть все папки" />
+		</panel>
+		<panel name="expand_panel">
+			<button label="Развернуть" name="expand_btn" tool_tip="Развернуть все папки" />
+		</panel>
+		<!-- / Used by StarLight skins -->
 		<panel name="dummy_panel">
 			<text name="ItemcountText">
 				Элементов

indra/newview/skins/default/xui/ru/strings.xml

@@ -6626,6 +6626,12 @@ ID объекта: [INSPECTING_KEY]
 	<string name="fs_preprocessor_caching_err">
 		Ошибка кэширования подключенного файла '[FILENAME]'
 	</string>
+	<string name="skin_defaults_starlight_location">
+		Отображение вашего текущего местоположения в меню было отключено по умолчанию для серии тем Starlight.
+	</string>
+	<string name="skin_defaults_starlight_navbar">
+		Отображение панели навигации было включено по умолчанию для серии тем Starlight.
+	</string>
 	<string name="fs_preprocessor_truncated">
 		Предупреждение: Выходные данные препроцессора усечены из-за чрезмерного размера текста скрипта. Этот скрипт, скорее всего, не будет работать.
 	</string>

indra/newview/skins/skins.xml

@@ -107,6 +107,74 @@
       </array>
     </map>
 
+    <map>
+      <key>name</key>
+      <string>StarLight</string>
+      <key>folder</key>
+      <string>starlight</string>
+      <key>themes</key>
+      <array>
+        <map>
+          <key>name</key>
+          <string>Original Orange</string>
+          <key>folder</key>
+          <string>original_orange</string>
+        </map>
+        <map>
+          <key>name</key>
+          <string>Original Teal</string>
+          <key>folder</key>
+          <string>original_teal</string>
+        </map>
+        <map>
+          <key>name</key>
+          <string>Mono Teal</string>
+          <key>folder</key>
+          <string>mono_teal</string>
+        </map>
+        <map>
+          <key>name</key>
+          <string>Nostalgia Blue</string>
+          <key>folder</key>
+          <string>nostalgia_blue</string>
+        </map>
+        <map>
+          <key>name</key>
+          <string>Silver Blue</string>
+          <key>folder</key>
+          <string>silver_blue</string>
+        </map>
+        <map>
+          <key>name</key>
+          <string>Silver Pink</string>
+          <key>folder</key>
+          <string>silver_pink</string>
+        </map>
+      </array>
+    </map>
+
+    <map>
+      <key>name</key>
+      <string>StarLight CUI</string>
+      <key>folder</key>
+      <string>starlightcui</string>
+      <key>themes</key>
+      <array>
+        <map>
+          <key>name</key>
+          <string>Custom Dark</string>
+          <key>folder</key>
+          <string>custom_dark</string>
+        </map>
+        <map>
+          <key>name</key>
+          <string>Custom Light</string>
+          <key>folder</key>
+          <string>custom_light</string>
+        </map>
+      </array>
+    </map>
+
     <map>
       <key>name</key>
       <string>Vintage</string>