diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-12-14 16:48:54 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-12-14 16:48:54 +0200 |
| commit | bf2efcf43e5efaf91220a0c77f3db792636edeb1 (patch) | |
| tree | 65738a1a964f01e7a7e98baa75d947cb2f34fe43 /indra/newview/lltexturectrl.cpp | |
| parent | 2d94edf250895c52981b33f44b3a2b6ff2ba302d (diff) | |
SL-10233 FIXED 'Default' button doesn't work in 'Pick:Texture' floater for multiple selections with different textures
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 a5a2eec246..1a2a10f721 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -131,7 +131,7 @@ LLFloaterTexturePicker::~LLFloaterTexturePicker() void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selection /*=true*/) { - if( mImageAssetID != image_id && mActive) + if( ((mImageAssetID != image_id) || mTentative) && mActive) { mNoCopyTextureSelected = FALSE; mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here? |