diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-28 11:20:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-28 11:20:06 -0500 |
| commit | 2752ab3b6212266047bd6b63b076d5be9b2a2d64 (patch) | |
| tree | cfae87bddb01cdf623a54b2a27c78ab2801c4a56 /indra/newview/lltexturectrl.cpp | |
| parent | 81553613551ffc7c8253d67a3fb3a24137d19d51 (diff) | |
| parent | 467c9f627c22dd88d9e9d058583b8279a2c5564e (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 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(); |