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

FIRE-33384 - AO updates. Make pernickety compilers happy.

master
Beq 2023-11-23 18:50:49 +00:00
parent f4fb4cdb75
commit 2aa11e6383
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/aoengine.cpp
View File

@ -987,7 +987,7 @@ void AOEngine::addSet(const std::string& name, inventory_func_type callback, boo
BOOL wasProtected = gSavedPerAccountSettings.getBOOL("LockAOFolders");
gSavedPerAccountSettings.setBOOL("LockAOFolders", FALSE);
LL_DEBUGS("AOEngine") << "adding set folder " << name << LL_ENDL;
gInventory.createNewCategory(mAOFolder, LLFolderType::FT_NONE, name, [callback, wasProtected, reload, this](const LLUUID &new_cat_id)
gInventory.createNewCategory(mAOFolder, LLFolderType::FT_NONE, name, [callback, wasProtected](const LLUUID &new_cat_id)
{
gSavedPerAccountSettings.setBOOL("LockAOFolders", wasProtected);
@ -2019,20 +2019,12 @@ void AOEngine::parseNotecard(const char* buffer)
std::vector<std::string> lines;
LLStringUtil::getTokens(text, lines, "\n");
S32 found = 0;
std::size_t index = 0;
for (const auto& line : lines)
{
if (line.find("Text length ") == 0)
{
found = index + 1;
break;
}
index++;
}
auto it = std::find_if(lines.begin(), lines.end(), [](const std::string& line) {
return line.find("Text length ") == 0;
});
if (!found)
{
if (it == lines.end()) {
// Line not found
LLNotificationsUtil::add("AOImportNoText", LLSD());
delete mImportSet;
mImportSet = nullptr;
@ -2040,6 +2032,9 @@ void AOEngine::parseNotecard(const char* buffer)
return;
}
// Line found, 'it' points to the found element
std::size_t found = std::distance(lines.begin(), it) + 1;
// mImportSet->getInventoryUUID() right now contains the folder UUID where the notecard is in
LLViewerInventoryCategory* importCategory = gInventory.getCategory(mImportSet->getInventoryUUID());
if (!importCategory)
@ -2055,16 +2050,15 @@ void AOEngine::parseNotecard(const char* buffer)
LLInventoryModel::cat_array_t* dummy;
LLInventoryModel::item_array_t* items;
gInventory.getDirectDescendentsOf(mImportSet->getInventoryUUID(), dummy, items);
for (index = 0; index < items->size(); ++index)
{
animationMap[items->at(index)->getName()] = items->at(index)->getUUID();
LL_DEBUGS("AOEngine") << "animation " << items->at(index)->getName() <<
" has inventory UUID " << animationMap[items->at(index)->getName()] << LL_ENDL;
}
gInventory.getDirectDescendentsOf(mImportSet->getInventoryUUID(), dummy, items);
for (auto& item : *items)
{
animationMap[item->getName()] = item->getUUID();
LL_DEBUGS("AOEngine") << "animation " << item->getName() << " has inventory UUID " << animationMap[item->getName()] << LL_ENDL;
}
// [ State ]Anim1|Anim2|Anim3
for (index = found; index < lines.size(); ++index)
for (auto index = found; index < lines.size(); ++index)
{
std::string line = lines[index];
@ -2159,7 +2153,7 @@ void AOEngine::processImport(bool from_timer)
if (mImportSet->getInventoryUUID().isNull())
{
// create new inventory folder for this AO set, the next timer tick should pick it up
addSet(mImportSet->getName(), [this, from_timer](const LLUUID& new_cat_id)
addSet(mImportSet->getName(), [this](const LLUUID& new_cat_id)
{
mImportSet->setInventoryUUID(new_cat_id);
}, false);