diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-27 20:46:51 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-27 20:47:05 +0300 |
| commit | 6860df0b981a0fa656bc21c98137dd2395578670 (patch) | |
| tree | f859adde770911b2b04a16131c8885c7f76ed805 | |
| parent | 0451d51f4da9780e2f650b67672a29b3d07cb386 (diff) | |
SL-17699 Enable 'none' button it amterial picker
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 5d9eb48e6c..ebb7ee609c 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -533,7 +533,7 @@ void LLFloaterTexturePicker::draw() } getChildView("Default")->setEnabled(mImageAssetID != mDefaultImageAssetID || mTentative); - getChildView("Blank")->setEnabled((mImageAssetID != mBlankImageAssetID && mBlankImageAssetID != mDefaultImageAssetID) || mTentative); + getChildView("Blank")->setEnabled((mImageAssetID != mBlankImageAssetID && mBlankImageAssetID.notNull()) || mTentative); getChildView("None")->setEnabled(mAllowNoTexture && (!mImageAssetID.isNull() || mTentative)); LLFloater::draw(); diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 104bcb9257..ff2323784c 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -252,6 +252,7 @@ width="64" /> <texture_picker can_apply_immediately="true" + allow_no_texture="true" follows="left|top" height="80" label="PBR " |