diff options
author | Callum Linden <callum@lindenlab.com> | 2022-08-30 15:23:37 -0700 |
---|---|---|
committer | Callum Linden <callum@lindenlab.com> | 2022-08-30 15:23:37 -0700 |
commit | 2aace1793b2940c86b2aa0d001137d09aec82dae (patch) | |
tree | cae30bd3700fe91c23adce45aeae17531f5f70db /indra/newview/lloutfitgallery.cpp | |
parent | ef58b9751a514e5e63cd77f9f78e6513bc6403cd (diff) | |
parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) |
Merge branch 'master' into DRTVWR-568
Diffstat (limited to 'indra/newview/lloutfitgallery.cpp')
-rw-r--r-- | indra/newview/lloutfitgallery.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 4febb72c6c..f419e2e06d 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -1374,6 +1374,7 @@ void LLOutfitGallery::onSelectPhoto(LLUUID selected_outfit_id) texture_floaterp->setOnFloaterCommitCallback(boost::bind(&LLOutfitGallery::onTexturePickerCommit, this, _1, _2)); texture_floaterp->setOnUpdateImageStatsCallback(boost::bind(&LLOutfitGallery::onTexturePickerUpdateImageStats, this, _1)); texture_floaterp->setLocalTextureEnabled(FALSE); + texture_floaterp->setBakeTextureEnabled(FALSE); texture_floaterp->setCanApply(false, true); } |