diff options
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 36fa4e9a37..29891ba235 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(); } |