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/llmaterialeditor.cpp | |
parent | 68875523e09f9fe06fc4b3cd5225995bb13966c3 (diff) | |
parent | 88aefc95eace0bb8ea21cb44514d41d98bdf74cc (diff) |
Merge branch 'DRTVWR-596' into davep/SL-20611
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
-rw-r--r-- | indra/newview/llmaterialeditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 70e21cae73..292ddb765f 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -436,10 +436,10 @@ BOOL LLMaterialEditor::postBuild() if (!gAgent.isGodlike()) { // Only allow fully permissive textures - mBaseColorTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); - mMetallicTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); - mEmissiveTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); - mNormalTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); + mBaseColorTextureCtrl->setFilterPermissionMasks(PERM_COPY | PERM_TRANSFER); + mMetallicTextureCtrl->setFilterPermissionMasks(PERM_COPY | PERM_TRANSFER); + mEmissiveTextureCtrl->setFilterPermissionMasks(PERM_COPY | PERM_TRANSFER); + mNormalTextureCtrl->setFilterPermissionMasks(PERM_COPY | PERM_TRANSFER); } // Texture callback |