diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-10-24 17:39:12 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-10-24 17:39:12 +0300 |
| commit | 4f5ea39c9150f70977983de9b7e02b13f9b0dc6a (patch) | |
| tree | 97dc9eea7d959bbb12062f0afb729b294b054a39 /indra | |
| parent | cfddb46b00fc5b2ecce90af7561e4f5c058f366f (diff) | |
MAINT-3208 FIXED Confusing button state when working with multiple textures and the default texture is the last selected.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/lltexturectrl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index a426669b5e..fec2fe8c04 100755 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -586,9 +586,9 @@ void LLFloaterTexturePicker::draw() mTentativeLabel->setVisible( FALSE ); } - getChildView("Default")->setEnabled(mImageAssetID != mOwner->getDefaultImageAssetID()); - getChildView("Blank")->setEnabled(mImageAssetID != mOwner->getBlankImageAssetID()); - getChildView("None")->setEnabled(mOwner->getAllowNoTexture() && !mImageAssetID.isNull() ); + getChildView("Default")->setEnabled(mImageAssetID != mOwner->getDefaultImageAssetID() || mOwner->getTentative()); + getChildView("Blank")->setEnabled(mImageAssetID != mOwner->getBlankImageAssetID() || mOwner->getTentative()); + getChildView("None")->setEnabled(mOwner->getAllowNoTexture() && (!mImageAssetID.isNull() || mOwner->getTentative())); LLFloater::draw(); |