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

FIRE-30501: Let's define My Suitcase properly and give it some icon and stuff...

master
Ansariel 2020-11-19 13:52:50 +01:00
parent 33629ee40a
commit 643fba98bc
12 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llfoldertype.cpp
View File

@ -102,6 +102,8 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_SETTINGS, new FolderEntry("settings", TRUE));
addEntry(LLFolderType::FT_MY_SUITCASE, new FolderEntry("suitcase", TRUE)); // <FS:Ansariel> OpenSim HG-support
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};

2
indra/llinventory/llfoldertype.h
View File

@ -99,6 +99,8 @@ public:
FT_RLV = 59,
// </FS:Ansariel> Folder types for our own virtual system folders
FT_MY_SUITCASE = 100, // <FS:Ansariel> OpenSim HG-support
FT_COUNT,
FT_NONE = -1

2
indra/newview/llfloaterbuycurrency.cpp
View File

@ -41,7 +41,9 @@
#include "llweb.h"
#include "llwindow.h"
#include "llappviewer.h"
#ifdef OPENSIM
#include "fsgridhandler.h" // <FS:Beq> FIRE-30481 open sim buy floater fixup
#endif
static const S32 STANDARD_BUY_AMOUNT = 2000;
static const S32 MINIMUM_BALANCE_AMOUNT = 0;

8
indra/newview/llinventoryfilter.cpp
View File

@ -49,7 +49,10 @@
// Firestorm includes
#include "llappearancemgr.h" // needed to query whether we are in COF
#ifdef OPENSIM
#include "fsgridhandler.h" // <FS:Beq> need to check if in opensim
#endif
LLTrace::BlockTimerStatHandle FT_FILTER_CLIPBOARD("Filter Clipboard");
LLInventoryFilter::FilterOps::FilterOps(const Params& p)
@ -285,10 +288,9 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
LLFolderType::EType cat_type = cat->getPreferredType();
// <FS:Beq> FIRE-30501 suitcase missing on 32 bit viewer.
#ifdef OPENSIM
if (LLGridManager::getInstance()->isInOpenSim())
if (LLGridManager::getInstance()->isInOpenSim() && cat_type == LLFolderType::FT_MY_SUITCASE)
{
constexpr int HG2_SUITCASE_TYPE{100}; // wrap magic number just in case it gets changed
if (cat_type == HG2_SUITCASE_TYPE){ return true; } // suitcase will always be shown
return true; // suitcase will always be shown
}
#endif
// </FS:Beq>

3
indra/newview/llviewerfoldertype.cpp
View File

@ -181,6 +181,9 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry(LLFolderType::FT_RLV, new ViewerFolderEntry("RLV", "Inv_RLVOpen", "Inv_RLVClosed", FALSE, true));
// </FS:Ansariel> Special Firestorm folder
// <FS:Ansariel> OpenSim HG-support
addEntry(LLFolderType::FT_MY_SUITCASE, new ViewerFolderEntry("My Suitcase", "Inv_SuitcaseOpen", "Inv_SuitcaseClosed", FALSE, true));
for (U32 type = (U32)LLFolderType::FT_ENSEMBLE_START; type <= (U32)LLFolderType::FT_ENSEMBLE_END; ++type)
{
addEntry((LLFolderType::EType)type, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false));

3
indra/newview/skins/ansastorm/textures/textures.xml
View File

@ -86,6 +86,9 @@
<texture name="Inv_RLVOpen" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_RLVClosed" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_SuitcaseOpen" file_name="legacy/inv_folder_suitcase.tga" />
<texture name="Inv_SuitcaseClosed" file_name="legacy/inv_folder_suitcase.tga" />
<!-- Marketplace Listings folders -->
<texture name="Inv_StockFolderClosed" file_name="legacy/inv_folder_stock_closed.tga" />
<texture name="Inv_StockFolderOpen" file_name="legacy/inv_folder_stock_open.tga" />

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

@ -394,6 +394,9 @@ with the same filename but different name
<texture name="Inv_PhoenixClosed" file_name="icons/Inv_SysClosed.png" />
<texture name="Inv_RLVOpen" file_name="icons/Inv_SysOpen.png" />
<texture name="Inv_RLVClosed" file_name="icons/Inv_SysClosed.png" />
<texture name="Inv_SuitcaseOpen" file_name="icons/Inv_SysOpen.png" />
<texture name="Inv_SuitcaseClosed" file_name="icons/Inv_SysClosed.png" />
<texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
<texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>

3
indra/newview/skins/default/xui/de/strings.xml
View File

@ -2026,6 +2026,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo
<string name="InvFolder All">
Alle
</string>
<string name="InvFolder My Suitcase">
Mein Koffer
</string>
<string name="no_attachments">
Keine Anhänge getragen
</string>

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -932,6 +932,8 @@ If you continue to receive this message, please contact Second Life support for
<string name="InvFolder #Firestorm">#Firestorm</string>
<string name="InvFolder #Phoenix">#Phoenix</string>
<string name="InvFolder #RLV">#RLV</string>
<string name="InvFolder My Suitcase">My Suitcase</string>
<string name="no_attachments">No attachments worn</string>
<string name="Attachments remain">Attachments ([COUNT] remain)</string>

3
indra/newview/skins/firestorm/textures/textures.xml
View File

@ -86,6 +86,9 @@
<texture name="Inv_RLVOpen" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_RLVClosed" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_SuitcaseOpen" file_name="legacy/inv_folder_suitcase.tga" />
<texture name="Inv_SuitcaseClosed" file_name="legacy/inv_folder_suitcase.tga" />
<!-- Marketplace Listings folders -->
<texture name="Inv_StockFolderClosed" file_name="legacy/inv_folder_stock_closed.tga" />
<texture name="Inv_StockFolderOpen" file_name="legacy/inv_folder_stock_open.tga" />

3
indra/newview/skins/latency/textures/textures.xml
View File

@ -368,6 +368,9 @@
<texture name="Inv_RLVOpen" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_RLVClosed" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_SuitcaseOpen" file_name="legacy/inv_folder_suitcase.tga" />
<texture name="Inv_SuitcaseClosed" file_name="legacy/inv_folder_suitcase.tga" />
<!-- Marketplace Listings folders -->
<texture name="Inv_StockFolderClosed" file_name="legacy/inv_folder_stock_closed.tga" />
<texture name="Inv_StockFolderOpen" file_name="legacy/inv_folder_stock_open.tga" />

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

@ -368,6 +368,9 @@
<texture name="Inv_RLVOpen" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_RLVClosed" file_name="legacy/inv_folder_RLVa.tga" />
<texture name="Inv_SuitcaseOpen" file_name="legacy/inv_folder_suitcase.tga" />
<texture name="Inv_SuitcaseClosed" file_name="legacy/inv_folder_suitcase.tga" />
<!-- Marketplace Listings folders -->
<texture name="Inv_StockFolderClosed" file_name="legacy/inv_folder_stock_closed.tga" />
<texture name="Inv_StockFolderOpen" file_name="legacy/inv_folder_stock_open.tga" />