diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-11-15 10:32:18 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-11-15 10:32:18 -0600 |
| commit | 361efcb9267f2c91f88198081bbe6ac2264766fd (patch) | |
| tree | 1b91985a7aa1bd48137fd493d6ce9444a7afb21b /indra/newview/llfloaterchangeitemthumbnail.cpp | |
| parent | 0edb7cad6bdeaf02cbd89d1f2dd38c47d6078c03 (diff) | |
| parent | 843866d193a0fb5ea882408c8862335ab9c5539b (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
Diffstat (limited to 'indra/newview/llfloaterchangeitemthumbnail.cpp')
| -rw-r--r-- | indra/newview/llfloaterchangeitemthumbnail.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp index f54240f6f4..0301627c15 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.cpp +++ b/indra/newview/llfloaterchangeitemthumbnail.cpp @@ -760,7 +760,7 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id) { //texture_floaterp->setTextureSelectedCallback(); //texture_floaterp->setOnUpdateImageStatsCallback(); - texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLPickerSource, const LLUUID&, const LLUUID&) + texture_floaterp->setOnFloaterCommitCallback([this](LLTextureCtrl::ETexturePickOp op, LLPickerSource, const LLUUID&, const LLUUID&, const LLUUID&) { if (op == LLTextureCtrl::TEXTURE_SELECT) { |