diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 15:40:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 15:40:12 -0400 |
| commit | 04568da18d2261f3f7b851cf5341b766c9648204 (patch) | |
| tree | 83d5db1c173636bb77ebb33e860fac77ab5d79e8 /indra/newview/llfloaterchangeitemthumbnail.cpp | |
| parent | 18d81e20f0b0044c16615953d7b69d7fb34d3449 (diff) | |
| parent | ff2d79906ccef217194d5d9ec9d7025db03592a8 (diff) | |
Merge pull request #2513 from secondlife/lua-merge-dev
Merge develop branch into Lua project branch.
Diffstat (limited to 'indra/newview/llfloaterchangeitemthumbnail.cpp')
| -rw-r--r-- | indra/newview/llfloaterchangeitemthumbnail.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp index 3e2e7cb7a3..fb31361fd9 100644 --- a/indra/newview/llfloaterchangeitemthumbnail.cpp +++ b/indra/newview/llfloaterchangeitemthumbnail.cpp @@ -951,8 +951,8 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit() || texturep->getFullWidth() == 0) { if (texturep->isFullyLoaded() - && (texturep->getCachedRawImageLevel() == 0 || texturep->getRawImageLevel() == 0) - && (texturep->isCachedRawImageReady() || texturep->isRawImageValid())) + && (texturep->getRawImageLevel() == 0) + && (texturep->isRawImageValid())) { LLUUID task_id = mTaskId; uuid_set_t inventory_ids = mItemList; @@ -962,20 +962,10 @@ void LLFloaterChangeItemThumbnail::onTexturePickerCommit() { onUploadComplete(asset_id, task_id, inventory_ids, handle); }; - if (texturep->isRawImageValid()) - { - LLFloaterSimpleSnapshot::uploadThumbnail(texturep->getRawImage(), - *mItemList.begin(), - mTaskId, - callback); - } - else - { - LLFloaterSimpleSnapshot::uploadThumbnail(texturep->getCachedRawImage(), - *mItemList.begin(), - mTaskId, - callback); - } + LLFloaterSimpleSnapshot::uploadThumbnail(texturep->getRawImage(), + *mItemList.begin(), + mTaskId, + callback); } else { |