livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-29572 - Add icon to currently playing animation in the FS AO

master
Zi Ree 2021-11-22 23:12:57 +01:00
parent 392f859f74
commit 72ce41ec0f
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/ao.cpp
View File

@ -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;
}

5
indra/newview/skins/default/textures/textures.xml
View File

@ -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" />

5
indra/newview/skins/vintage/textures/textures.xml
View File

@ -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" />