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

#4195 Clear code from a merge conflict 

This part was removed unintentionally, due to a merge conflict resolution.
master
Andrey Kleshchev 2025-10-06 16:54:17 +03:00
parent 5fe152cfea
commit 9c28607a7c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llgltfmateriallist.cpp
View File

@ -380,6 +380,17 @@ void LLGLTFMaterialList::queueApply(const LLViewerObject* obj, S32 side, const L
LLGLTFMaterial* material = new LLGLTFMaterial(*material_override); LLGLTFMaterial* material = new LLGLTFMaterial(*material_override);
sApplyQueue.push_back({ obj->getID(), side, asset_id, material }); sApplyQueue.push_back({ obj->getID(), side, asset_id, material });
} }
if (sUpdates.size() >= MAX_TASK_UPDATES)
{
LLCoros::instance().launch("modifyMaterialCoro",
std::bind(&LLGLTFMaterialList::modifyMaterialCoro,
gAgent.getRegionCapability("ModifyMaterialParams"),
sUpdates,
std::shared_ptr<CallbackHolder>(nullptr)));
sUpdates = LLSD::emptyArray();
}
} }
void LLGLTFMaterialList::queueUpdate(const LLSD& data) void LLGLTFMaterialList::queueUpdate(const LLSD& data)