summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-03-29 10:29:30 -0700
committerAnchor Linden <anchor@lindenlab.com>2018-03-29 10:29:30 -0700
commit7c6dcae68007489e616af00cfccbbd6b2c2eb50d (patch)
tree21245cbdb3ff48db67f2179a72ef2bf418ba56b0
parent513d1728c3417d1d6fdf7046bc792ecdcbb25440 (diff)
MAINT-8438: Setting attachment bake texture to None does not refresh the base avatar bake
-rw-r--r--indra/newview/lltexturectrl.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 97876dd60a..7f1169a5c2 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1012,7 +1012,10 @@ void LLFloaterTexturePicker::onBakeTextureSelect(LLUICtrl* ctrl, void *user_data
{
self->setCanApply(true, true);
self->setImageID(self->mDefaultImageAssetID);
- self->commitIfImmediateSet();
+ if (self->mCanPreview)
+ {
+ self->commitIfImmediateSet();
+ }
}
}