From 72ce41ec0f536ad3f94c9cd24fa0c471bfc9da5b Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Mon, 22 Nov 2021 23:12:57 +0100
Subject: [PATCH] FIRE-29572 - Add icon to currently playing animation in the
 FS AO

---
 indra/newview/ao.cpp                              | 10 +++++-----
 indra/newview/skins/default/textures/textures.xml |  5 +++++
 indra/newview/skins/vintage/textures/textures.xml |  5 +++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp
index a0e3077d62..4484dd1793 100644
--- a/indra/newview/ao.cpp
+++ b/indra/newview/ao.cpp
@@ -428,7 +428,7 @@ LLScrollListItem* FloaterAO::addAnimation(const std::string& name)
 	LLSD row;
 	row["columns"][0]["column"] = "icon";
 	row["columns"][0]["type"] = "icon";
-	row["columns"][0]["value"] = "Inv_Animation";
+	row["columns"][0]["value"] = "FSAO_Animation_Stopped";
 
 	row["columns"][1]["column"] = "animation_name";
 	row["columns"][1]["type"] = "text";
@@ -809,8 +809,8 @@ void FloaterAO::onAnimationChanged(const LLUUID& animation)
 
 	if (mCurrentBoldItem)
 	{
-		LLScrollListText* column = (LLScrollListText*)mCurrentBoldItem->getColumn(1);
-		column->setFontStyle(LLFontGL::NORMAL);
+		((LLScrollListIcon*)mCurrentBoldItem->getColumn(0))->setValue("FSAO_Animation_Stopped");
+		((LLScrollListText*)mCurrentBoldItem->getColumn(1))->setFontStyle(LLFontGL::NORMAL);
 
 		mCurrentBoldItem = nullptr;
 	}
@@ -832,8 +832,8 @@ void FloaterAO::onAnimationChanged(const LLUUID& animation)
 		{
 			mCurrentBoldItem = item;
 
-			LLScrollListText* column = (LLScrollListText*)mCurrentBoldItem->getColumn(1);
-			column->setFontStyle(LLFontGL::BOLD);
+			((LLScrollListIcon*)mCurrentBoldItem->getColumn(0))->setValue("FSAO_Animation_Playing");
+			((LLScrollListText*)mCurrentBoldItem->getColumn(1))->setFontStyle(LLFontGL::BOLD);
 
 			return;
 		}
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4d2154940c..14da8e3c34 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -243,6 +243,11 @@ with the same filename but different name
   <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
   <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
 
+<!-- FS:Zi: FIRE-29572 - Add icon to currently playing animation in the FS AO -->
+  <texture name="FSAO_Animation_Playing" file_name="icn_play.tga" preload="false" />
+  <texture name="FSAO_Animation_Stopped" file_name="icons/Inv_Animation.png" preload="false" />
+<!-- /FS:Zi: FIRE-29572 -->
+
   <texture name="Generic_Experience" file_name="Blank.png" preload="false" />
   <texture name="Generic_Group" file_name="icons/Generic_Group.png" preload="false" />
   <texture name="Generic_Group_Large" file_name="icons/Generic_Group_Large.png" preload="false" />
diff --git a/indra/newview/skins/vintage/textures/textures.xml b/indra/newview/skins/vintage/textures/textures.xml
index 98d5bbacdc..1c27efbda0 100644
--- a/indra/newview/skins/vintage/textures/textures.xml
+++ b/indra/newview/skins/vintage/textures/textures.xml
@@ -281,6 +281,11 @@
 		scale.right="144"
 		scale.bottom="3" />
 
+	<!-- FS:Zi: FIRE-29572 - Add icon to currently playing animation in the FS AO -->
+	<texture name="FSAO_Animation_Playing" file_name="widgets/ScrollArrow_Right.png" preload="false" />
+	<texture name="FSAO_Animation_Stopped" file_name="legacy/inv_item_animation.tga" preload="false" />
+	<!-- END FS:Zi: FIRE-29572 -->
+
 	<!-- Direct delivery icon for Received Items folder -->
 	<texture name="Inv_InboxOpen"   file_name="legacy/inv_folder_plain_open.tga" />
 	<texture name="Inv_InboxClosed"   file_name="legacy/inv_folder_plain_closed.tga" />