SL-18446 Material override arrival filtering

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 87c94041d3..749cd4cd54 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -107,6 +107,7 @@ public:
     void saveLiveValues(); // for restoration on cancel
 
     static void updateLive();
+    static void updateLive(const LLUUID &object_id, S32 te);
     static void loadLive();
     static void loadObjectSave();
 
@@ -283,8 +284,11 @@ private:
 
     // if true, this instance is live instance editing overrides
     bool mIsOverride = false;
+    bool mOverrideInProgress = false;
     // local id, texture ids per face for object overrides
     // for "cancel" support
+    static LLUUID mOverrideObjectId; // static to avoid searching for the floater
+    static S32 mOverrideObjectTE;
     std::map<U32, uuid_vec_t> mObjectOverridesSavedValues;
     boost::signals2::connection mSelectionUpdateSlot;
 };