From 25ca098dc9b883bdd9aab47ae8ddb9c951f5fe24 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Mon, 14 Apr 2025 04:31:53 +1000
Subject: [PATCH] Fix GLTF nuking while using LL texture panel

---
 indra/newview/fspanelface.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/fspanelface.cpp b/indra/newview/fspanelface.cpp
index ea4558d355..3ef59c8c3d 100644
--- a/indra/newview/fspanelface.cpp
+++ b/indra/newview/fspanelface.cpp
@@ -220,10 +220,10 @@ void getSelectedGLTFMaterialMaxRepeats(LLGLTFMaterial::TextureInfo channel, F32&
 //
 
 // local preview of material changes
-class LLRenderMaterialFunctor : public LLSelectedTEFunctor
+class FSRenderMaterialFunctor : public LLSelectedTEFunctor
 {
 public:
-    LLRenderMaterialFunctor(const LLUUID &id)
+    FSRenderMaterialFunctor(const LLUUID &id)
         : mMatId(id)
     {
     }
@@ -249,10 +249,10 @@ private:
 // TODO: look at how to handle local textures, especially when saving materials
 // - Would be nice if we had this in its own file so we could include it from both sides ... -Zi
 //
-class LLRenderMaterialOverrideFunctor : public LLSelectedNodeFunctor
+class FSRenderMaterialOverrideFunctor : public LLSelectedNodeFunctor
 {
 public:
-    LLRenderMaterialOverrideFunctor(
+    FSRenderMaterialOverrideFunctor(
         LLGLTFMaterial* material_to_apply,
         U32 unsaved_changes
     )
@@ -1100,7 +1100,7 @@ void FSPanelFace::draw()
         getGLTFMaterial(mat);
 
         LLObjectSelectionHandle selected_objects = LLSelectMgr::getInstance()->getSelection();
-        LLRenderMaterialOverrideFunctor override_func(mat, mUnsavedChanges);
+        FSRenderMaterialOverrideFunctor override_func(mat, mUnsavedChanges);
         selected_objects->applyToNodes(&override_func);
 
         LLGLTFMaterialList::flushUpdates();