livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer

meow-7.2.2
Ansariel 2023-07-28 18:20:13 +02:00
parent d99535d765 1cf4a2c952
commit cb1cb4b505
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/lltexturectrl.cpp
View File

@ -330,7 +330,8 @@ bool LLFloaterTexturePicker::updateImageStats()
S32 height = mTexturep->getFullHeight();
if (width > 0 && height > 0)
{
if (width < mMinDim
if (width != height
|| width < mMinDim
|| width > mMaxDim
|| height < mMinDim
|| height > mMaxDim
@ -792,11 +793,11 @@ void LLFloaterTexturePicker::commitIfImmediateSet()
if (!mNoCopyTextureSelected && mCanApply && mCanPreview)
// </FS:Ansariel>
{
commitCallback();
commitCallback(LLTextureCtrl::TEXTURE_CHANGE);
}
}
void LLFloaterTexturePicker::commitCallback()
void LLFloaterTexturePicker::commitCallback(LLTextureCtrl::ETexturePickOp op)
{
if (!mOnFloaterCommitCallback)
{
@ -853,7 +854,7 @@ void LLFloaterTexturePicker::commitCallback()
break;
}
mOnFloaterCommitCallback(LLTextureCtrl::TEXTURE_CHANGE, mode, asset_id, inventory_id);
mOnFloaterCommitCallback(op, mode, asset_id, inventory_id);
}
void LLFloaterTexturePicker::commitCancel()
{
@ -943,7 +944,7 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata)
void LLFloaterTexturePicker::onBtnSelect(void* userdata)
{
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
self->commitCallback();
self->commitCallback(LLTextureCtrl::TEXTURE_SELECT);
self->closeFloater();
}

2
indra/newview/lltexturectrl.h
View File

@ -330,7 +330,7 @@ public:
void updateFilterPermMask();
void commitIfImmediateSet();
void commitCallback();
void commitCallback(LLTextureCtrl::ETexturePickOp op);
void commitCancel();
void onFilterEdit(const std::string& search_string);