diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-08-04 05:00:59 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-08-04 05:00:59 +0300 |
| commit | b5378f93b298098cf841286ba6eb970ee5d855eb (patch) | |
| tree | c2f395318d33ae90c12d88d4258796b7ce6db62d /indra/newview/llpanelobjectinventory.cpp | |
| parent | 8f5676202821b9b8addb19fe8b93bac56057c6af (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge viewer-release and become version 3.8.3
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelobjectinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 1ae9d916b3..c8af5b6718 100755 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -130,7 +130,7 @@ public: virtual void move(LLFolderViewModelItem* parent_listener); virtual BOOL isItemCopyable() const; virtual BOOL copyToClipboard() const; - virtual BOOL cutToClipboard() const; + virtual BOOL cutToClipboard(); virtual BOOL isClipboardPasteable() const; virtual void pasteFromClipboard(); virtual void pasteLinkFromClipboard(); @@ -542,7 +542,7 @@ BOOL LLTaskInvFVBridge::copyToClipboard() const return FALSE; } -BOOL LLTaskInvFVBridge::cutToClipboard() const +BOOL LLTaskInvFVBridge::cutToClipboard() { return FALSE; } |