diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-28 17:07:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-28 17:07:57 -0500 |
| commit | ee227feed38d157cf42df1987555f0188888fc62 (patch) | |
| tree | 12242822a149c8d878d2a86f6c018365599a6ebe /indra/newview/llpanelface.cpp | |
| parent | 3b08abf70b69f4905dae550d766eaf7de4983be7 (diff) | |
| parent | c61224bef22686c4e6f5b4a6af9acbeb27d561ab (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index c6e0bc5153..6d8d19c57c 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -223,7 +223,7 @@ BOOL LLPanelFace::postBuild() if (pbr_ctrl) { pbr_ctrl->setDefaultImageAssetID(LLUUID::null); - pbr_ctrl->setBlankImageAssetID(LLUUID::null); // should there be some empty default material? + pbr_ctrl->setBlankImageAssetID(LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID); pbr_ctrl->setCommitCallback(boost::bind(&LLPanelFace::onCommitPbr, this, _2)); pbr_ctrl->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelPbr, this, _2)); pbr_ctrl->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectPbr, this, _2)); |