summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-10 18:30:41 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-10 18:30:41 +0200
commit0ecc677b4970959f1cd7b14f12e01ab331eae6c7 (patch)
tree2c7ccdfb399268a20b420ca706435a223dab1845 /indra
parentd68f379786ed54dbce9dcf921ded4cccd0c5c61e (diff)
SL-18583 Missed flushUpdates
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelface.cpp2
-rw-r--r--indra/newview/llselectmgr.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index f88735e275..fec5ac906f 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4249,6 +4249,8 @@ void LLPanelFace::onPasteTexture()
LLPanelFaceUpdateFunctor sendfunc(true, true);
selected_objects->applyToObjects(&sendfunc);
+ LLGLTFMaterialList::flushUpdates();
+
LLPanelFaceNavigateHomeFunctor navigate_home_func;
selected_objects->applyToTEs(&navigate_home_func);
}
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 22dae36255..fef6c97caf 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1818,6 +1818,8 @@ void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
}
}
}
+
+ LLGLTFMaterialList::flushUpdates();
}
@@ -2016,6 +2018,8 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
}
} sendfunc(item);
getSelection()->applyToObjects(&sendfunc);
+
+ LLGLTFMaterialList::flushUpdates();
}
//-----------------------------------------------------------------------------