summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-10 17:28:09 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-10 17:47:48 +0200
commitd68f379786ed54dbce9dcf921ded4cccd0c5c61e (patch)
treec3beae4b01b0bbab6ffe696b87cf6be8a3acf706 /indra/newview/llpanelface.cpp
parent34a8cb75bbc7c02936014a68a3012dee255199a9 (diff)
SL-18583 Fixed incorrect values being applied when returning to a case without override
Diffstat (limited to 'indra/newview/llpanelface.cpp')
-rw-r--r--indra/newview/llpanelface.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 37ecf72b1b..f88735e275 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4408,12 +4408,7 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
tep->setGLTFMaterialOverride(nullptr);
// blank out any override data on the server
- LLCoros::instance().launch("modifyMaterialCoro",
- std::bind(&LLGLTFMaterialList::modifyMaterialCoro,
- gAgent.getRegionCapability("ModifyMaterialParams"),
- llsd::map(
- "object_id", objectp->getID(),
- "side", te), nullptr));
+ LLGLTFMaterialList::queueApplyMaterialAsset(objectp->getID(), te, LLUUID::null);
}
// Texture map