summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-09-28 20:01:06 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-09-28 20:01:06 +0300
commit6b46793771a1d1db1601105604ac7bc82f8db7b3 (patch)
tree3efef3160a1a6540414d2b619a6671acf82f9d88 /indra/newview/llmaterialeditor.h
parenta63fcfc9d584075bb263ccf10857852b3327be43 (diff)
SL-18233 Double clicking material in an object shows notecard
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;