diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-11-30 12:19:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 12:19:38 -0600 |
| commit | a09b083b1b18d293d97dd84dd4849924b2766a4f (patch) | |
| tree | 6f0cbfd33d0cf125432ad0b8b93a2b052143ee14 /indra/newview/llpanelface.cpp | |
| parent | 68875523e09f9fe06fc4b3cd5225995bb13966c3 (diff) | |
| parent | 88aefc95eace0bb8ea21cb44514d41d98bdf74cc (diff) | |
Merge branch 'DRTVWR-596' into davep/SL-20611
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 02c00e7f87..ffcc4be290 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1915,8 +1915,6 @@ public: { gInventory.removeObserver(this); mChangePending = false; - - LLInventoryObserver::~LLInventoryObserver(); } }; @@ -1982,7 +1980,7 @@ void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, if (objectp->isAttachment()) { - pbr_ctrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER | PERM_MODIFY); + pbr_ctrl->setFilterPermissionMasks(PERM_COPY | PERM_TRANSFER | PERM_MODIFY); } else { |