summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-10-28 19:58:27 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-10-28 20:08:53 +0300
commit6d0fcc0e616ff58f4a83bc3730374c5509ee959a (patch)
tree3ab31e4ded9fd2ec0fc7ac7c33f3b7ec7ff8fdc9 /indra/newview/lltexturectrl.cpp
parente72d0161bb086799d445b54e0e73c2dc13e4643a (diff)
SL-17699 Blank material Id for material picker
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index ebb7ee609c..07e09ec038 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -700,8 +700,9 @@ void LLFloaterTexturePicker::onBtnBlank(void* userdata)
void LLFloaterTexturePicker::onBtnNone(void* userdata)
{
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
+ self->setCanApply(true, true);
self->setImageID( LLUUID::null );
- self->commitCancel();
+ self->commitIfImmediateSet();
}
/*