diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
commit | eb81d5f23fc725f53857d7a62923e273a057c455 (patch) | |
tree | 5c1ba76e722d9630fa597023a1e6c196a04f758c /indra/newview/llviewerobject.cpp | |
parent | f8ccb39b8d944f9d2bf4308f909273cd5a35cbe7 (diff) | |
parent | 47985e5822ce9fdebb7443e13b3c1a781a842ecd (diff) |
Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwds
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 668596b96c..8b9a59a79b 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2711,7 +2711,7 @@ void LLViewerObject::doUpdateInventory( deleteInventoryItem(item_id); LLPermissions perm(item->getPermissions()); LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(this); - bool is_atomic = ((S32)LLAssetType::AT_OBJECT == item->getType()) ? false : true; + bool is_atomic = (S32)LLAssetType::AT_OBJECT != item->getType(); if(obj_perm) { perm.setOwnerAndGroup(LLUUID::null, obj_perm->getOwner(), obj_perm->getGroup(), is_atomic); |