diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-12-13 20:51:27 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-12-13 20:51:27 -0500 |
| commit | d4822f10142887daa9ef2d5575a2c2e1bb24b389 (patch) | |
| tree | 3b0b66779887ce2dcc3b2d027ce9b9d68c145d3b /indra/newview/llpanelobjectinventory.cpp | |
| parent | 424d3ef83cdb354e66789f22f65394f4db523128 (diff) | |
| parent | 9e7829c9cb140f994c9aa12dddcd4518c4c43a40 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index d61cc26f62..38f7883b82 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -132,7 +132,7 @@ public: virtual BOOL removeItem(); virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch); virtual void move(LLFolderViewModelItem* parent_listener); - virtual BOOL isItemCopyable() const; + virtual bool isItemCopyable(bool can_copy_as_link = true) const; virtual BOOL copyToClipboard() const; virtual BOOL cutToClipboard(); virtual BOOL isClipboardPasteable() const; @@ -440,10 +440,10 @@ void LLTaskInvFVBridge::move(LLFolderViewModelItem* parent_listener) { } -BOOL LLTaskInvFVBridge::isItemCopyable() const +bool LLTaskInvFVBridge::isItemCopyable(bool can_link) const { LLInventoryItem* item = findItem(); - if(!item) return FALSE; + if(!item) return false; return gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); } |