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

# Conflicts:
#	.github/release.yaml

.github/release.yaml

@@ -1,18 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-    authors:
-      - dependabot 
-  categories:
-    - title: Breaking Changes 🛠
-      labels:
-        - semver-major
-        - breaking-change
-    - title: New Features 🎉
-      labels:
-        - semver-minor
-        - enhancement
-    - title: Other Changes
-      labels:
-        - '*'

.gitignore

@@ -123,3 +123,5 @@ firestorm.code-workspace
 
 .cache/clangd/index/
 *-compiled.glsl
+
+.github/release.yaml

indra/newview/aoengine.cpp

@@ -911,7 +911,25 @@ void AOEngine::cycle(eCycleMode cycleMode)
 				state->mCurrentAnimation = 0;
 			}
 		}
-		animation = state->mAnimations[state->mCurrentAnimation].mAssetUUID;
+
+		AOSet::AOAnimation& anim = state->mAnimations[state->mCurrentAnimation];
+
+		if (anim.mAssetUUID.isNull())
+		{
+			LL_DEBUGS("AOEngine") << "Asset UUID for cycled animation " << anim.mName << " not yet known, try to find it." << LL_ENDL;
+
+			if(LLViewerInventoryItem* item = gInventory.getItem(anim.mInventoryUUID) ; item)
+			{
+				LL_DEBUGS("AOEngine") << "Found asset UUID for cycled animation: " << item->getAssetUUID() << " - Updating AOAnimation.mAssetUUID" << LL_ENDL;
+				anim.mAssetUUID = item->getAssetUUID();
+			}
+			else
+			{
+				LL_DEBUGS("AOEngine") << "Inventory UUID " << anim.mInventoryUUID << " for cycled animation " << anim.mName << " still returns no asset." << LL_ENDL;
+			}
+		}
+
+		animation = anim.mAssetUUID;
 	}
 
 	// don't do anything if the animation didn't change
@@ -1308,15 +1326,17 @@ void AOEngine::reloadStateAnimations(AOSet::AOState* state)
 				<< " asset " << item->getAssetUUID() << LL_ENDL;
 
 			AOSet::AOAnimation anim;
-			anim.mAssetUUID = item->getAssetUUID();
-			LLViewerInventoryItem* linkedItem = item->getLinkedItem();
-			if (!linkedItem)
+			anim.mName = item->LLInventoryItem::getName();
+			anim.mInventoryUUID = item->getLinkedUUID();
+
+			anim.mAssetUUID = LLUUID::null;
+
+			// if we can find the original animation already right here, save its asset ID, otherwise this will
+			// be tried again in AOSet::getAnimationForState() and/or AOEngine::cycle()
+			if (item->getLinkedItem())
 			{
-				LL_WARNS("AOEngine") << "linked item for link " << item->LLInventoryItem::getName() << " not found (broken link). Skipping." << LL_ENDL;
-				continue;
+				anim.mAssetUUID = item->getAssetUUID();
 			}
-			anim.mName = linkedItem->LLInventoryItem::getName();
-			anim.mInventoryUUID = item->getUUID();
 
 			S32 sortOrder;
 			if (!LLStringUtil::convertToS32(item->LLInventoryItem::getDescription(), sortOrder))
@@ -1365,6 +1385,13 @@ void AOEngine::update()
 		return;
 	}
 
+	if (!gInventory.isCategoryComplete(mAOFolder))
+	{
+		LL_DEBUGS("AOEngine") << "#AO folder hasn't fully fetched yet, try again next timer tick." << LL_ENDL;
+		gInventory.fetchDescendentsOf(mAOFolder);
+		return;
+	}
+
 	// move everything that's not an animation link to "lost and found"
 	if (findForeignItems(mAOFolder))
 	{

indra/newview/aoset.cpp

@@ -27,6 +27,7 @@
 #include "aoengine.h"
 #include "aoset.h"
 #include "llanimationstates.h"
+#include "llinventorymodel.h"
 
 AOSet::AOSet(const LLUUID inventoryID)
 :	LLEventTimer(10000.0f),
@@ -190,7 +191,25 @@ const LLUUID& AOSet::getAnimationForState(AOState* state) const
 					LL_DEBUGS("AOEngine") << "cycle " << state->mCurrentAnimation << " of " << numOfAnimations << LL_ENDL;
 				}
 			}
-			return state->mAnimations[state->mCurrentAnimation].mAssetUUID;
+
+			AOAnimation& anim = state->mAnimations[state->mCurrentAnimation];
+
+			if (anim.mAssetUUID.isNull())
+			{
+				LL_DEBUGS("AOEngine") << "Asset UUID for chosen animation " << anim.mName << " not yet known, try to find it." << LL_ENDL;
+
+				if(LLViewerInventoryItem* item = gInventory.getItem(anim.mInventoryUUID) ; item)
+				{
+					LL_DEBUGS("AOEngine") << "Found asset UUID for chosen animation: " << item->getAssetUUID() << " - Updating AOAnimation.mAssetUUID" << LL_ENDL;
+					anim.mAssetUUID = item->getAssetUUID();
+				}
+				else
+				{
+					LL_DEBUGS("AOEngine") << "Inventory UUID " << anim.mInventoryUUID << " for chosen animation " << anim.mName << " still returns no asset." << LL_ENDL;
+				}
+			}
+
+			return anim.mAssetUUID;
 		}
 		else
 		{

indra/newview/skins/default/xui/az/panel_preferences_graphics1.xml

@@ -2,7 +2,7 @@
 <panel label="Qrafika" name="Display panel">
 	<tab_container label="Qrafika seçimləri" name="tabs">
 		<panel label="Ümumi" name="General">
-			<text name="preset_label" width="90">
+			<text name="preset_label">
 				Öntəyinlər:
 			</text>
 			<text name="preset_text">

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

@@ -2,7 +2,7 @@
 <panel label="Grafik" name="Display panel">
 <tab_container label="Graphics Prefs" name="tabs">
 	<panel label="Allgemein" name="General">
-		<text name="preset_label" width="130">
+		<text name="preset_label">
 			Aktuelle Voreinstellung:
 		</text>
 		<text name="QualitySpeed">

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

@@ -37,7 +37,7 @@
     left="5"
     name="preset_label"
     top="5"
-    width="70">
+    width="130">
       Preset in use:
   </text>
 

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

@@ -6,31 +6,49 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas [FILTER]
 	</panel.string>
-	<filter_editor label="Filtrar" name="inventory search editor" tool_tip="Escribe uno o más términos a buscar, separados por '+' "/>
-	<button name="collapse_btn" label="Contraer"/>
-	<button name="expand_btn" label="Expandir"/>
-	<text name="filter_label" value="Filtrar:"/>
-	<combo_box name="filter_combo_box">
-		<combo_box.item value="filter_type_all" label="Todo"/>
-		<combo_box.item value="filter_type_animations" label="Animaciones"/>
-		<combo_box.item value="filter_type_calling_cards" label="Tarjetas de visita"/>
-		<combo_box.item value="filter_type_clothing" label="Ropa / Partes del cuerpo"/>
-		<combo_box.item value="filter_type_gestures" label="Gestos"/>
-		<combo_box.item value="filter_type_landmarks" label="Hitos"/>
-		<combo_box.item value="filter_type_notecards" label="Notas"/>
-		<combo_box.item value="filter_type_objects" label="Objetos"/>
-		<combo_box.item value="filter_type_scripts" label="Scripts"/>
-		<combo_box.item value="filter_type_sounds" label="Sonidos"/>
-		<combo_box.item value="filter_type_textures" label="Texturas"/>
-		<combo_box.item value="filter_type_snapshots" label="Fotografías"/>
-		<combo_box.item value="filter_type_meshes" label="Modelos mesh"/>
-		<combo_box.item value="filter_type_custom" label="Personalizado..."/>
-	</combo_box>
-	<tab_container name="inventory filter tabs">
-		<inventory_panel label="INVENTARIO" name="All Items"/>
-		<recent_inventory_panel label="RECIENTE" name="Recent Items"/>
-		<worn_inventory_panel label="EN USO" name="Worn Items"/>
-	</tab_container>
+	<layout_stack name="nav_stack">
+		<layout_panel name="nav_buttons">
+			<button name="back_btn" tool_tip="Regresa" />
+			<button name="forward_btn" tool_tip="Avanzar" />
+			<button name="up_btn" tool_tip="Sube un nivel" />
+		</layout_panel>
+		<layout_panel name="filter_panel">
+			<filter_editor label="Filtrar" name="inventory search editor" tool_tip="Escribe uno o más términos a buscar, separados por '+' "/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="ctrl_stack">
+		<layout_panel name="collapse_expand_buttons">
+			<button name="collapse_btn" label="Contraer"/>
+			<button name="expand_btn" label="Expandir"/>
+		</layout_panel>
+		<layout_panel name="filter_ctrls">
+			<text name="filter_label" value="Filtrar:"/>
+			<combo_box name="filter_combo_box">
+				<combo_box.item value="filter_type_all" label="Todo"/>
+				<combo_box.item value="filter_type_animations" label="Animaciones"/>
+				<combo_box.item value="filter_type_calling_cards" label="Tarjetas de visita"/>
+				<combo_box.item value="filter_type_clothing" label="Ropa / Partes del cuerpo"/>
+				<combo_box.item value="filter_type_gestures" label="Gestos"/>
+				<combo_box.item value="filter_type_landmarks" label="Hitos"/>
+				<combo_box.item value="filter_type_notecards" label="Notas"/>
+				<combo_box.item value="filter_type_objects" label="Objetos"/>
+				<combo_box.item value="filter_type_scripts" label="Scripts"/>
+				<combo_box.item value="filter_type_sounds" label="Sonidos"/>
+				<combo_box.item value="filter_type_textures" label="Texturas"/>
+				<combo_box.item value="filter_type_snapshots" label="Fotografías"/>
+				<combo_box.item value="filter_type_meshes" label="Modelos mesh"/>
+				<combo_box.item value="filter_type_custom" label="Personalizado..."/>
+			</combo_box>
+			<menu_button tool_tip="Mostrar opciones de visibilidad de búsqueda" name="options_visibility_btn" />
+		</layout_panel>
+	</layout_stack>
+	<panel name="default_inventory_panel">
+		<tab_container name="inventory filter tabs">
+			<inventory_panel label="INVENTARIO" name="All Items"/>
+			<recent_inventory_panel label="RECIENTE" name="Recent Items"/>
+			<worn_inventory_panel label="EN USO" name="Worn Items"/>
+		</tab_container>
+	</panel>
 	<panel name="bottom_panel">
 		<panel name="options_gear_btn_panel">
 			<menu_button name="options_gear_btn" tool_tip="Ver más opciones"/>

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

@@ -2,7 +2,7 @@
 <panel label="Grafica" name="Display panel">
 	<tab_container label="Impostazioni grafiche" name="tabs">
 		<panel label="Generale" name="General">
-			<text name="preset_label" width="130">
+			<text name="preset_label">
 				Preset in uso:
 			</text>
 			<text name="QualitySpeed">

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

@@ -6,7 +6,7 @@
 	<!-- 一般 -->
 	
 	<panel label="一般" name="General">
-		<text name="preset_label" width="95">
+		<text name="preset_label">
 			使用中のプリセット:
 		</text>
 

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

@@ -2,7 +2,7 @@
 <panel label="Grafika" name="Display panel">
 	<tab_container label="Ustawienia graficzne" name="tabs">
 		<panel label="Ogólne" name="General">
-			<text name="preset_label" width="110">
+			<text name="preset_label">
 				Ustawienie w użyciu:
 			</text>
 			<text name="preset_text">

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

@@ -2,7 +2,7 @@
 <panel label="Графика" name="Display panel">
 	<tab_container label="Настройки графики" name="tabs">
 		<panel label="Общее" name="General">
-			<text name="preset_label" width="90">
+			<text name="preset_label">
 				Предустановка:
 			</text>
 			<text name="preset_text">