diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-09 17:10:31 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-09 17:10:31 -0600 |
| commit | 1ed8f7cd0ca41ab655aaeeaf141eb4ef20f16bd0 (patch) | |
| tree | 5ef366323c8e6080fae48c8fe2b5d23bb698699e /indra/newview/llmaterialeditor.cpp | |
| parent | 14d901f25fdc10df871a60294eefcf4b9fb00931 (diff) | |
SL-18602 Fix for applying material asset not removing overrides on drag-and-drop
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 675ca610ce..17da7e8853 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -2526,7 +2526,7 @@ public: { mSuccess = true; } - LLGLTFMaterialList::queueModifyMaterial(objectp->getID(), te, *material); + LLGLTFMaterialList::queueModifyMaterial(objectp->getID(), te, material); #else std::string overrides_json = material->asJSON(); @@ -2598,7 +2598,7 @@ void LLMaterialEditor::applyToSelection() void(*done_callback)(bool) = LLRenderMaterialOverrideFunctor::modifyCallback; - LLGLTFMaterialList::flushModifyMaterialQueue(done_callback); + LLGLTFMaterialList::flushUpdates(done_callback); if (!override_func.getResult()) { |