From 41766caa88a567009c91da123a8a65868e447717 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 5 Mar 2024 14:55:11 +0100 Subject: [PATCH] FIRE-33740: Fix asset blacklisting not persisting data anymore --- indra/newview/fsassetblacklist.cpp | 2 +- indra/newview/fsassetblacklist.h | 2 +- indra/newview/llstartup.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/fsassetblacklist.cpp b/indra/newview/fsassetblacklist.cpp index bd59437e4a..098543a998 100644 --- a/indra/newview/fsassetblacklist.cpp +++ b/indra/newview/fsassetblacklist.cpp @@ -66,7 +66,7 @@ LLAssetType::EType S32toAssetType(S32 assetindex) return type; } -void FSAssetBlacklist::initSingleton() +void FSAssetBlacklist::init() { mBlacklistFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "asset_blacklist.xml"); loadBlacklist(); diff --git a/indra/newview/fsassetblacklist.h b/indra/newview/fsassetblacklist.h index d7a90b10ff..d7fbdcb612 100644 --- a/indra/newview/fsassetblacklist.h +++ b/indra/newview/fsassetblacklist.h @@ -44,7 +44,7 @@ class FSAssetBlacklist : public LLSingleton LLSINGLETON_EMPTY_CTOR(FSAssetBlacklist); public: - void initSingleton() override; + void init(); bool isBlacklisted(const LLUUID& id, LLAssetType::EType type); void addNewItemToBlacklist(const LLUUID& id, const std::string& name, const std::string& region, LLAssetType::EType type, bool permanent = true, bool save = true); void addNewItemToBlacklistData(const LLUUID& id, const LLSD& data, bool save = true); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 9287f7e81c..c9b6090590 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1532,7 +1532,7 @@ bool idle_startup() LLFile::mkdir(user_fonts_path_name.c_str()); // Initalize Account based asset_blacklist - FSAssetBlacklist::instance(); + FSAssetBlacklist::getInstance()->init(); // load per grid data FSData::instance().downloadAgents();