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

Some improvements

master
Ansariel 2025-12-08 11:05:26 +01:00
parent 67aaccf251
commit 90dabb068c
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/fsfavoritegroups.cpp
View File

@ -43,7 +43,7 @@ FSFavoriteGroups::~FSFavoriteGroups()
bool FSFavoriteGroups::isFavorite(const LLUUID& group_id) const bool FSFavoriteGroups::isFavorite(const LLUUID& group_id) const
{ {
return mFavoriteGroups.find(group_id) != mFavoriteGroups.end(); return mFavoriteGroups.contains(group_id);
} }
void FSFavoriteGroups::addFavorite(const LLUUID& group_id) void FSFavoriteGroups::addFavorite(const LLUUID& group_id)
@ -85,15 +85,14 @@ void FSFavoriteGroups::loadFavorites()
{ {
mFavoriteGroups.clear(); mFavoriteGroups.clear();
LLSD favorites = gSavedPerAccountSettings.getLLSD("FSFavoriteGroups");
if (favorites.isArray()) if (LLSD favorites = gSavedPerAccountSettings.getLLSD("FSFavoriteGroups"); favorites.isArray())
{ {
for (LLSD::array_const_iterator it = favorites.beginArray(); it != favorites.endArray(); ++it) for (const auto& groupId : llsd::inArray(favorites))
{ {
if (it->isUUID()) if (groupId.isUUID())
{ {
mFavoriteGroups.insert(it->asUUID()); mFavoriteGroups.insert(groupId.asUUID());
} }
} }
} }
@ -103,8 +102,7 @@ void FSFavoriteGroups::loadFavorites()
void FSFavoriteGroups::saveFavorites() void FSFavoriteGroups::saveFavorites()
{ {
uuid_set_t stale_groups;
std::set<LLUUID> stale_groups;
for (const auto& group_id : mFavoriteGroups) for (const auto& group_id : mFavoriteGroups)
{ {
if (!gAgent.isInGroup(group_id)) if (!gAgent.isInGroup(group_id))
@ -133,5 +131,3 @@ void FSFavoriteGroups::saveFavorites()
LL_DEBUGS("FavoriteGroups") << "Saved " << mFavoriteGroups.size() << " favorite groups to per-account settings" << LL_ENDL; LL_DEBUGS("FavoriteGroups") << "Saved " << mFavoriteGroups.size() << " favorite groups to per-account settings" << LL_ENDL;
} }

6
indra/newview/fsfavoritegroups.h
View File

@ -30,8 +30,6 @@
#include "llsingleton.h" #include "llsingleton.h"
#include "lluuid.h" #include "lluuid.h"
#include <boost/signals2.hpp>
#include <set>
class FSFavoriteGroups : public LLSingleton<FSFavoriteGroups> class FSFavoriteGroups : public LLSingleton<FSFavoriteGroups>
{ {
@ -43,7 +41,7 @@ public:
void addFavorite(const LLUUID& group_id); void addFavorite(const LLUUID& group_id);
void removeFavorite(const LLUUID& group_id); void removeFavorite(const LLUUID& group_id);
void toggleFavorite(const LLUUID& group_id); void toggleFavorite(const LLUUID& group_id);
const std::set<LLUUID>& getFavorites() const { return mFavoriteGroups; } const uuid_set_t& getFavorites() const { return mFavoriteGroups; }
bool hasFavorites() const { return !mFavoriteGroups.empty(); } bool hasFavorites() const { return !mFavoriteGroups.empty(); }
void loadFavorites(); void loadFavorites();
void saveFavorites(); void saveFavorites();
@ -55,7 +53,7 @@ public:
} }
private: private:
std::set<LLUUID> mFavoriteGroups; uuid_set_t mFavoriteGroups;
favorites_changed_signal_t mFavoritesChangedSignal; favorites_changed_signal_t mFavoritesChangedSignal;
}; };