diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-16 16:07:58 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-16 16:07:58 -0600 |
| commit | d5395502525ad3ebcfa2b75be23544d022b18dbc (patch) | |
| tree | 532311803cc838bcc234f0eaa0212d6281d4df0f /indra/newview/llmaterialeditor.cpp | |
| parent | bc4694e82a5fa7aaafe77e9e3cb84f5b781e741a (diff) | |
| parent | 6387fbb378ff3ec5a8cf1e217eb4f2d71134c180 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index a9728e26da..d5948b297c 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -378,6 +378,20 @@ BOOL LLMaterialEditor::postBuild() mBaseColorCtrl = getChild<LLColorSwatchCtrl>("base color"); mEmissiveColorCtrl = getChild<LLColorSwatchCtrl>("emissive color"); + if (!gAgent.isGodlike()) + { + // Only allow fully permissive textures + mBaseColorTextureCtrl->setImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mBaseColorTextureCtrl->setNonImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mMetallicTextureCtrl->setImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mMetallicTextureCtrl->setNonImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mEmissiveTextureCtrl->setImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mEmissiveTextureCtrl->setNonImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mNormalTextureCtrl->setImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + mNormalTextureCtrl->setNonImmediateFilterPermMask(PERM_ITEM_UNRESTRICTED); + } + + // Texture callback mBaseColorTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_BASE_COLOR_TEX_DIRTY)); mMetallicTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_METALLIC_ROUGHTNESS_TEX_DIRTY)); mEmissiveTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_EMISIVE_TEX_DIRTY)); |