diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-01-11 16:20:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-01-11 16:20:35 -0600 |
| commit | ccedb5a6de62b339255898abc9b9faf0d2e4e132 (patch) | |
| tree | c19450a468d34ef97b221ddca10dc39c86aca431 /indra/newview/llpanelface.cpp | |
| parent | b9a4d81d5140b34199a6582b1189473b6a2e72fb (diff) | |
| parent | 3e1afc3c917e655e8fd91a3b4b369c95a44ad981 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 0b18bdc6e6..cf02f3c4e4 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -4527,8 +4527,8 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te) tep->setGLTFRenderMaterial(nullptr); tep->setGLTFMaterialOverride(nullptr); - // blank out any override data on the server - LLGLTFMaterialList::queueApply(objectp->getID(), te, LLUUID::null); + // blank out most override data on the server + LLGLTFMaterialList::queueApply(objectp, te, LLUUID::null); } // Texture map |