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

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

master
Ansariel 2022-12-02 18:57:11 +01:00
parent 13a509fe05 78ca3a0406
commit 5daf2b01ee
2 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
indra/newview/fsfloaterwearablefavorites.cpp
View File

@ -42,6 +42,8 @@
#include "rlvactions.h"
#include "rlvlocks.h"
// Hello Kokua! Have fun yoinking! ;)
#define FS_WEARABLE_FAVORITES_FOLDER "#Wearable Favorites"
static LLDefaultChildRegistry::Register<FSWearableFavoritesItemsList> r("fs_wearable_favorites_items_list");
@ -85,7 +87,7 @@ LLUUID FSFloaterWearableFavorites::sFolderID = LLUUID();
FSFloaterWearableFavorites::FSFloaterWearableFavorites(const LLSD& key)
: LLFloater(key),
mItemsList(NULL),
mItemsList(nullptr),
mInitialized(false),
mDADCallbackConnection()
{
@ -199,6 +201,30 @@ BOOL FSFloaterWearableFavorites::handleKeyHere(KEY key, MASK mask)
return LLFloater::handleKeyHere(key, mask);
}
// static
std::optional<LLUUID> FSFloaterWearableFavorites::getWearableFavoritesFolderID()
{
LLUUID fs_root_cat_id = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
if (!fs_root_cat_id.isNull())
{
LLInventoryModel::item_array_t* items;
LLInventoryModel::cat_array_t* cats;
gInventory.getDirectDescendentsOf(fs_root_cat_id, cats, items);
if (cats)
{
for (const auto& cat : *cats)
{
if (cat->getName() == FS_WEARABLE_FAVORITES_FOLDER)
{
return cat->getUUID();
}
}
}
}
return std::nullopt;
}
// static
void FSFloaterWearableFavorites::initCategory()
{
@ -208,63 +234,30 @@ void FSFloaterWearableFavorites::initCategory()
return;
}
LLUUID fs_favs_id;
LLUUID fs_root_cat_id = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
if (!fs_root_cat_id.isNull())
if (auto fs_favs_id = getWearableFavoritesFolderID(); fs_favs_id.has_value())
{
LLInventoryModel::item_array_t* items;
LLInventoryModel::cat_array_t* cats;
gInventory.getDirectDescendentsOf(fs_root_cat_id, cats, items);
if (cats)
{
for (LLInventoryModel::cat_array_t::iterator it = cats->begin(); it != cats->end(); ++it)
{
if ((*it)->getName() == FS_WEARABLE_FAVORITES_FOLDER)
{
fs_favs_id = (*it)->getUUID();
break;
}
}
}
sFolderID = fs_favs_id.value();
}
else
{
fs_root_cat_id = gInventory.createNewCategory(gInventory.getRootFolderID(), LLFolderType::FT_NONE, ROOT_FIRESTORM_FOLDER);
}
LLUUID fs_root_cat_id = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
if (fs_root_cat_id.isNull())
{
fs_root_cat_id = gInventory.createNewCategory(gInventory.getRootFolderID(), LLFolderType::FT_NONE, ROOT_FIRESTORM_FOLDER);
}
if (fs_favs_id.isNull())
{
fs_favs_id = gInventory.createNewCategory(fs_root_cat_id, LLFolderType::FT_NONE, FS_WEARABLE_FAVORITES_FOLDER);
sFolderID = gInventory.createNewCategory(fs_root_cat_id, LLFolderType::FT_NONE, FS_WEARABLE_FAVORITES_FOLDER);
}
sFolderID = fs_favs_id;
}
//static
LLUUID FSFloaterWearableFavorites::getFavoritesFolder()
{
if (sFolderID.notNull())
if (!sFolderID.isNull())
{
return sFolderID;
}
LLUUID fs_root_cat_id = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
if (!fs_root_cat_id.isNull())
{
LLInventoryModel::item_array_t* items;
LLInventoryModel::cat_array_t* cats;
gInventory.getDirectDescendentsOf(fs_root_cat_id, cats, items);
if (cats)
if (auto fs_favs_id = getWearableFavoritesFolderID(); fs_favs_id.has_value())
{
for (LLInventoryModel::cat_array_t::iterator it = cats->begin(); it != cats->end(); ++it)
{
if ((*it)->getName() == FS_WEARABLE_FAVORITES_FOLDER)
{
sFolderID = (*it)->getUUID();
break;
}
}
sFolderID = fs_favs_id.value();
}
}
@ -283,7 +276,7 @@ void FSFloaterWearableFavorites::updateList(const LLUUID& folder_id)
void FSFloaterWearableFavorites::onItemDAD(const LLUUID& item_id)
{
link_inventory_object(sFolderID, item_id, LLPointer<LLInventoryCallback>(NULL));
link_inventory_object(sFolderID, item_id, LLPointer<LLInventoryCallback>(nullptr));
}
void FSFloaterWearableFavorites::handleRemove()
@ -291,9 +284,9 @@ void FSFloaterWearableFavorites::handleRemove()
uuid_vec_t selected_item_ids;
mItemsList->getSelectedUUIDs(selected_item_ids);
for (uuid_vec_t::iterator it = selected_item_ids.begin(); it != selected_item_ids.end(); ++it)
for (const auto& id : selected_item_ids)
{
remove_inventory_item(*it, LLPointer<LLInventoryCallback>(NULL));
remove_inventory_item(id, LLPointer<LLInventoryCallback>(nullptr));
}
}
@ -378,4 +371,3 @@ void FSFloaterWearableFavorites::onDoubleClick()
}
}
}

3
indra/newview/fsfloaterwearablefavorites.h
View File

@ -30,6 +30,7 @@
#include "llfloater.h"
#include "llwearableitemslist.h"
#include <optional>
class LLButton;
class LLFilterEditor;
@ -92,6 +93,8 @@ private:
void onOptionsMenuItemClicked(const LLSD& userdata);
bool onOptionsMenuItemChecked(const LLSD& userdata);
static std::optional<LLUUID> getWearableFavoritesFolderID();
bool mInitialized;
boost::signals2::connection mDADCallbackConnection;