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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 7fd8e950a3..c6b976ea5a 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -143,6 +143,9 @@ public:
void onClickCancel();
void onCancelMsgCallback(const LLSD& notification, const LLSD& response);
+ // llpreview
+ void setObjectID(const LLUUID& object_id) override;
+
// llpanel
BOOL postBuild() override;
void onClickCloseBtn(bool app_quitting = false) override;
@@ -211,7 +214,6 @@ private:
friend class LLMaterialFilePicker;
LLUUID mAssetID;
- LLUUID mObjectID;
LLTextureCtrl* mBaseColorTextureCtrl;
LLTextureCtrl* mMetallicTextureCtrl;