From 8679b86cdebed65c116dc02978cbcd83e8da4fa5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Wed, 15 Oct 2025 22:32:06 +0300
Subject: #2570 Fix extra setGLTFRenderMaterial

setRenderMaterialID already calls setGLTFRenderMaterial
---
 indra/newview/llpanelface.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llpanelface.cpp')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 3ab48f69c8..182b648914 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4721,7 +4721,6 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
                 if (allow)
                 {
                     objectp->setRenderMaterialID(te, te_data["te"]["pbr"].asUUID(), false /*managing our own update*/);
-                    tep->setGLTFRenderMaterial(nullptr);
                     tep->setGLTFMaterialOverride(nullptr);
 
                     if (te_data["te"].has("pbr_override"))
@@ -4737,7 +4736,6 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
             else
             {
                 objectp->setRenderMaterialID(te, LLUUID::null, false /*send in bulk later*/ );
-                tep->setGLTFRenderMaterial(nullptr);
                 tep->setGLTFMaterialOverride(nullptr);
 
                 // blank out most override data on the server
-- 
cgit v1.2.3