diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-11-02 10:49:05 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-11-02 10:49:05 -0500 |
| commit | 439d26ccdc2864794036a8f6432664755f2b8234 (patch) | |
| tree | 321ada0200c50e4e5bb7c5c4dd81dce436f4602f /indra/newview/lltooldraganddrop.cpp | |
| parent | 65fb4e67cb55f048c3ac8d0e46fc585f737c48ad (diff) | |
| parent | 911dcb40fdf90d4f1e647860d257f7c13914ee49 (diff) | |
Merge branch 'DRTVWR-559' of ssh://github.com/secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 97be78df77..e7f96239fd 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -961,7 +961,9 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj, LLNotificationsUtil::add("ErrorMessage", args); return FALSE; } - if (hit_obj->getInventoryItemByAsset(item->getAssetUUID())) + // Make sure to verify both id and type since 'null' + // is a shared default for some asset types. + if (hit_obj->getInventoryItemByAsset(item->getAssetUUID(), item->getType())) { // if the asset is already in the object's inventory // then it can always be added to a side. |