Skip to content

Commit 9c28607

Browse files
committed
#4195 Clear code from a merge conflict
This part was removed unintentionally, due to a merge conflict resolution.
1 parent 5fe152c commit 9c28607

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

indra/newview/llgltfmateriallist.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,17 @@ void LLGLTFMaterialList::queueApply(const LLViewerObject* obj, S32 side, const L
380380
LLGLTFMaterial* material = new LLGLTFMaterial(*material_override);
381381
sApplyQueue.push_back({ obj->getID(), side, asset_id, material });
382382
}
383+
384+
if (sUpdates.size() >= MAX_TASK_UPDATES)
385+
{
386+
LLCoros::instance().launch("modifyMaterialCoro",
387+
std::bind(&LLGLTFMaterialList::modifyMaterialCoro,
388+
gAgent.getRegionCapability("ModifyMaterialParams"),
389+
sUpdates,
390+
std::shared_ptr<CallbackHolder>(nullptr)));
391+
392+
sUpdates = LLSD::emptyArray();
393+
}
383394
}
384395

385396
void LLGLTFMaterialList::queueUpdate(const LLSD& data)

0 commit comments

Comments
 (0)