diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-08-15 12:32:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 12:32:25 -0700 |
| commit | c527356f8a94df0dd280d683b26cf9e2938424b6 (patch) | |
| tree | 1ff690377748d0ca9681230f941f9bf6ff4b8e78 /indra/newview/lltooldraganddrop.cpp | |
| parent | 50e2973cd2360dedd6baf1c0772d9d009e2628d4 (diff) | |
| parent | 465632214aad5e9979d12247149aa716a23d6899 (diff) | |
Merge pull request #324 from secondlife/SL-20024
SL-20024: Double-check object inventory is not pending when save button pressed
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 23a6634154..afcdb26f1a 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1012,8 +1012,12 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj, { hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); } - // TODO: Check to see if adding the item was successful; if not, then - // we should return false here. + // Force the object to update and refetch its inventory so it has this asset. + hit_obj->dirtyInventory(); + hit_obj->requestInventory(); + // TODO: Check to see if adding the item was successful; if not, then + // we should return false here. This will requre a separate listener + // since without listener, we have no way to receive update } else if (!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) |