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

Maybe let's just make this static instead...

meow-7.2.2
Ansariel 2025-06-19 18:27:37 +02:00
parent 092d98b601
commit 309552d5aa
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/fsassetblacklist.cpp
View File

@ -85,17 +85,19 @@ LLSD FSAssetBlacklistData::toLLSD() const
FSAssetBlacklistData FSAssetBlacklistData::fromLLSD(const LLSD& data)
{
FSAssetBlacklistData blacklistdata;
std::string asset_date = data["asset_date"].asString() + "Z";
asset_date.replace(asset_date.find(" "), 1, "T");
name = data["asset_name"].asString();
region = data["asset_region"].asString();
type = S32toAssetType(data["asset_type"].asInteger());
flags = data.has("asset_blacklist_flag") ? data["asset_blacklist_flag"].asInteger() : 0;
date = LLDate(asset_date);
permanent = data["asset_permanent"].asBoolean();
blacklistdata.name = data["asset_name"].asString();
blacklistdata.region = data["asset_region"].asString();
blacklistdata.type = S32toAssetType(data["asset_type"].asInteger());
blacklistdata.flags = data.has("asset_blacklist_flag") ? data["asset_blacklist_flag"].asInteger() : 0;
blacklistdata.date = LLDate(asset_date);
blacklistdata.permanent = data["asset_permanent"].asBoolean();
return *this;
return blacklistdata;
}
void FSAssetBlacklist::init()
@ -332,7 +334,7 @@ void FSAssetBlacklist::loadBlacklist()
gObjectList.addDerenderedItem(uid, true);
}
addNewItemToBlacklistData(uid, FSAssetBlacklistData().fromLLSD(entry_data), false);
addNewItemToBlacklistData(uid, FSAssetBlacklistData::fromLLSD(entry_data), false);
}
}
}
@ -370,7 +372,7 @@ void FSAssetBlacklist::loadBlacklist()
newdata["asset_date"] = data["entry_date"].asString();
newdata["asset_permanent"] = true; // For conversion of old data
addNewItemToBlacklistData(uid, FSAssetBlacklistData().fromLLSD(newdata), false);
addNewItemToBlacklistData(uid, FSAssetBlacklistData::fromLLSD(newdata), false);
}
}
oldfile.close();

2
indra/newview/fsassetblacklist.h
View File

@ -45,7 +45,7 @@ struct FSAssetBlacklistData
bool permanent{ false };
LLSD toLLSD() const;
FSAssetBlacklistData fromLLSD(const LLSD& data);
static FSAssetBlacklistData fromLLSD(const LLSD& data);
};
using blacklisted_uuid_container_t = std::unordered_set<LLUUID>;

2
indra/newview/fsdata.cpp
View File

@ -513,7 +513,7 @@ void FSData::processAssets(const LLSD& assets)
{
continue;
}
FSAssetBlacklist::instance().addNewItemToBlacklistData(uid, FSAssetBlacklistData().fromLLSD(data), false);
FSAssetBlacklist::instance().addNewItemToBlacklistData(uid, FSAssetBlacklistData::fromLLSD(data), false);
LL_DEBUGS("fsdata") << "Added " << uid << " to assets list." << LL_ENDL;
}
}