SL-17640 Handle unsaved changes better

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index b2a6e96eac..a632d5c823 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -29,6 +29,7 @@
 #include "llpreview.h"
 #include "llvoinventorylistener.h"
 #include "llimagej2c.h"
+#include "llviewertexture.h"
 
 class LLTextureCtrl;
 
@@ -171,6 +172,13 @@ private:
     std::string mMetallicRoughnessName;
     std::string mEmissiveName;
 
+    // keep pointers to fetched textures or viewer will remove them
+    // if user temporary selects something else with 'apply now'
+    LLPointer<LLViewerFetchedTexture> mAlbedoFetched;
+    LLPointer<LLViewerFetchedTexture> mNormalFetched;
+    LLPointer<LLViewerFetchedTexture> mMetallicRoughnessFetched;
+    LLPointer<LLViewerFetchedTexture> mEmissiveFetched;
+
     // J2C versions of packed buffers for uploading
     LLPointer<LLImageJ2C> mAlbedoJ2C;
     LLPointer<LLImageJ2C> mNormalJ2C;