diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-10-06 16:54:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-10-06 17:09:01 +0300 |
| commit | 9c28607a7c787b8ee623da76ef3a4861d612316e (patch) | |
| tree | 60ad3ae32887240374e6fc06099cae7512d21443 | |
| parent | 5fe152cfea87c04c1edf2caa7d419a056a7916a2 (diff) | |
#4195 Clear code from a merge conflict
This part was removed unintentionally, due to a merge conflict resolution.
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index 64b6d20cd6..3e4aadc381 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -380,6 +380,17 @@ void LLGLTFMaterialList::queueApply(const LLViewerObject* obj, S32 side, const L LLGLTFMaterial* material = new LLGLTFMaterial(*material_override); 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) |