From 2dd2bf520016782a91235d9081535dea6dc2dd11 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 29 Jun 2020 19:40:01 -0400
Subject: [PATCH] Code to support coming AO changes
---
indra/llinventory/llfoldertype.cpp | 3 +++
indra/llinventory/llfoldertype.h | 7 ++++++-
indra/newview/llviewerfoldertype.cpp | 3 +++
.../textures/icons/Inv_FolderClosedToxic.png | Bin 0 -> 15512 bytes
.../textures/icons/Inv_FolderOpenToxic.png | Bin 0 -> 15512 bytes
.../newview/skins/default/textures/textures.xml | 2 ++
indra/newview/skins/default/xui/en/strings.xml | 3 +++
7 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 indra/newview/skins/default/textures/icons/Inv_FolderClosedToxic.png
create mode 100644 indra/newview/skins/default/textures/icons/Inv_FolderOpenToxic.png
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index 7241b3c0c28..27bb4058a01 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -102,6 +102,9 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_SETTINGS, new FolderEntry("settings", TRUE));
+ addEntry(LLFolderType::FT_SUITCASE, new FolderEntry("suitcase", TRUE));
+ addEntry(LLFolderType::FT_ANIM_OVERRIDES, new FolderEntry("animover", TRUE));
+
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/llinventory/llfoldertype.h b/indra/llinventory/llfoldertype.h
index 85b86f9ce54..2367b9bfddf 100644
--- a/indra/llinventory/llfoldertype.h
+++ b/indra/llinventory/llfoldertype.h
@@ -32,7 +32,7 @@
// This class handles folder types (similar to assettype, except for folders)
// and operations on those.
-class LL_COMMON_API LLFolderType
+class LLFolderType
{
public:
// ! BACKWARDS COMPATIBILITY ! Folder type enums must match asset type enums.
@@ -93,6 +93,11 @@ class LL_COMMON_API LLFolderType
FT_SETTINGS = 56,
+ FT_SUITCASE = 100,
+
+ FT_ANIM_OVERRIDES,
+ FT_TOXIC,
+
FT_COUNT,
FT_NONE = -1
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index afa84a5afc1..0efae1e38a4 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -144,8 +144,11 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new ViewerFolderEntry("Marketplace Listings", "Inv_SysOpen", "Inv_SysClosed", FALSE, boxes_invisible));
addEntry(LLFolderType::FT_MARKETPLACE_STOCK, new ViewerFolderEntry("New Stock", "Inv_StockFolderOpen", "Inv_StockFolderClosed", FALSE, false, "default"));
addEntry(LLFolderType::FT_MARKETPLACE_VERSION, new ViewerFolderEntry("New Version", "Inv_VersionFolderOpen","Inv_VersionFolderClosed", FALSE, false, "default"));
+ addEntry(LLFolderType::FT_SUITCASE, new ViewerFolderEntry("My Suitcase", "Inv_SysOpen", "Inv_SysClosed", FALSE, false));
+ addEntry(LLFolderType::FT_ANIM_OVERRIDES, new ViewerFolderEntry("Animation Overrides", "Inv_SysOpen", "Inv_SysClosed", FALSE, false));
addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false, "default"));
+ addEntry(LLFolderType::FT_TOXIC, new ViewerFolderEntry("Firstorm", "Inv_FolderOpenToxic", "Inv_FolderClosedToxic", FALSE, false));
for (U32 type = (U32)LLFolderType::FT_ENSEMBLE_START; type <= (U32)LLFolderType::FT_ENSEMBLE_END; ++type)
{
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderClosedToxic.png b/indra/newview/skins/default/textures/icons/Inv_FolderClosedToxic.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf2e5542ef8f86dc61b888181faa19d2e3342ef
GIT binary patch
literal 15512
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
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderOpenToxic.png b/indra/newview/skins/default/textures/icons/Inv_FolderOpenToxic.png
new file mode 100644
index 0000000000000000000000000000000000000000..8627b689f2ff62186456891e02db6d422df06d9c
GIT binary patch
literal 15512
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
N_~7B(r!O5p^*64opbh{4
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 9b9ea093bee..b12246d97e6 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -294,7 +294,9 @@ with the same filename but different name
<texture name="Inv_Clothing" file_name="icons/Inv_Clothing.png" preload="false" />
<texture name="Inv_Eye" file_name="icons/Inv_Eye.png" preload="false" />
<texture name="Inv_FolderClosed" file_name="icons/Inv_FolderClosed.png" preload="false" />
+ <texture name="Inv_FolderClosedToxic" file_name="icons/Inv_FolderClosedToxic.png" preload="false" />
<texture name="Inv_FolderOpen" file_name="icons/Inv_FolderOpen.png" preload="false" />
+ <texture name="Inv_FolderOpenToxic" file_name="icons/Inv_FolderOpenToxic.png" preload="false" />
<texture name="Inv_Gesture" file_name="icons/Inv_Gesture.png" preload="false" />
<texture name="Inv_Gloves" file_name="icons/Inv_Gloves.png" preload="false" />
<texture name="Inv_Hair" file_name="icons/Inv_Hair.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fcff4499c5c..f400a07921a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2425,6 +2425,7 @@ If you continue to receive this message, please contact Second Life support for
<string name="Since Logoff" value=" - Since Logoff" />
<!-- inventory folder -->
+ <string name="InvFolder Basic Root">Basic Root</string>
<string name="InvFolder My Inventory">My Inventory</string>
<string name="InvFolder Library">Library</string>
<string name="InvFolder Textures">Textures</string>
@@ -2459,6 +2460,8 @@ If you continue to receive this message, please contact Second Life support for
<string name="InvFolder Meshes">Meshes</string>
<string name="InvFolder Received Items">Received Items</string>
<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
+ <string name="InvFolder Animation Overrides">Animation Overrides</string>
+ <string name="InvFolder #Firestorm">#Firestorm</string>
<!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
<string name="InvFolder Friends">Friends</string>
--
GitLab