diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 36fa4e9a3725a351bde51d1f695fb0008e0de8f2..29891ba23554ad84916c76588a342bed1fd4a18f 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -715,11 +715,11 @@ void LLFloaterTexturePicker::commitIfImmediateSet() { if (!mNoCopyTextureSelected && mCanApply) { - commitCallback(); + commitCallback(LLTextureCtrl::TEXTURE_CHANGE); } } -void LLFloaterTexturePicker::commitCallback() +void LLFloaterTexturePicker::commitCallback(LLTextureCtrl::ETexturePickOp op) { if (!mOnFloaterCommitCallback) { @@ -776,7 +776,7 @@ void LLFloaterTexturePicker::commitCallback() break; } - mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, mode, asset_id, inventory_id); + mOnFloaterCommitCallback(op, mode, asset_id, inventory_id); } void LLFloaterTexturePicker::commitCancel() { @@ -845,7 +845,7 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata) void LLFloaterTexturePicker::onBtnSelect(void* userdata) { LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata; - self->commitCallback(); + self->commitCallback(LLTextureCtrl::TEXTURE_SELECT); self->closeFloater(); } diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 3cf886107535ad0e90583f75e48959fe6008650e..60543191b65ea2c688f3e8f9575aba5f185ce36b 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -317,7 +317,7 @@ class LLFloaterTexturePicker : public LLFloater void updateFilterPermMask(); void commitIfImmediateSet(); - void commitCallback(); + void commitCallback(LLTextureCtrl::ETexturePickOp op); void commitCancel(); void onFilterEdit(const std::string& search_string);