From 8faaa4b8e235bfe384772f12ffad695e5942a1a1 Mon Sep 17 00:00:00 2001 From: Anchor Date: Sun, 23 Jun 2019 13:09:57 -0700 Subject: [SL-11433] - fix dirty flag in texture picker --- indra/newview/lltexturectrl.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index ae10972b5f..8a2fc881a9 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -746,7 +746,7 @@ void LLFloaterTexturePicker::onBtnSelect(void* userdata) local_id = LLLocalBitmapMgr::getWorldID(temp_id); } } - self->mViewModel->setDirty(); + if (self->mOnFloaterCommitCallback) { self->mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_SELECT, local_id); @@ -1589,7 +1589,6 @@ void LLTextureCtrl::setBakeTextureEnabled(BOOL enabled) if (floaterp) { floaterp->setBakeTextureEnabled(enabled); - floaterp->resetDirty(); } } -- cgit v1.2.3