summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
-rw-r--r--indra/newview/llmaterialeditor.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index dc41cc386f..1fb10dbcf1 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -167,6 +167,7 @@ public:
void onClickCloseBtn(bool app_quitting = false) override;
void onClose(bool app_quitting) override;
+ void draw() override;
void handleReshape(const LLRect& new_rect, bool by_user = false) override;
LLUUID getBaseColorId();
@@ -288,11 +289,13 @@ private:
// if true, this instance is live instance editing overrides
bool mIsOverride = false;
- bool mOverrideInProgress = false;
+ bool mHasSelection = 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;
+ static bool mOverrideInProgress;
+ static bool mSelectionNeedsUpdate;
boost::signals2::connection mSelectionUpdateSlot;
};