diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-28 16:49:26 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-28 16:49:26 -0500 |
| commit | d3b77a3fb7a9ad91344e88dc65d0f1c4f2776df5 (patch) | |
| tree | bfd86f3a6d275ed8e417115788e040d67f7e728b /indra/newview/llmaterialeditor.h | |
| parent | f887f65830c05d15517cbd8f15ca0e59210dfbee (diff) | |
| parent | 144fb0c315b5db9ddb275110ca923965ff8bbb49 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 4 |
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; |