diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-07-22 00:22:35 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-07-22 00:51:44 +0300 |
| commit | 7b9206dfd15ee90fde421525254b0a29d94f1ef2 (patch) | |
| tree | a70bd7e7f1d0c808f075f2847e83b00218d19295 /indra/newview/llfloaterchangeitemthumbnail.cpp | |
| parent | d237b9ee1b0bbcdb3431f8afc873af4ee9e21a4e (diff) | |
SL-20045 Texture picker should apply the exact texture inventory item
Diffstat (limited to 'indra/newview/llfloaterchangeitemthumbnail.cpp')
| -rw-r--r-- | indra/newview/llfloaterchangeitemthumbnail.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp index 1ad235ac0a..d7fbf1384b 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.cpp +++ b/indra/newview/llfloaterchangeitemthumbnail.cpp @@ -698,11 +698,11 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id) { //texture_floaterp->setTextureSelectedCallback(); //texture_floaterp->setOnUpdateImageStatsCallback(); - texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLUUID id) + texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLPickerSource, const LLUUID&, const LLUUID&) { if (op == LLTextureCtrl::TEXTURE_SELECT) { - onTexturePickerCommit(id); + onTexturePickerCommit(); } } ); @@ -722,7 +722,7 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id) floaterp->setFocus(TRUE); } -void LLFloaterChangeItemThumbnail::onTexturePickerCommit(LLUUID id) +void LLFloaterChangeItemThumbnail::onTexturePickerCommit() { LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mPickerHandle.get(); |
