diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
| commit | 9df2e7e4cb11a3ca7fabc2a3c443564da18b9a13 (patch) | |
| tree | 29f0229aa5ad443ed36d56a2dca0102fd83c1447 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 5a0025026cee93eb657290544b95eb00557ae5f1 (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
Merge
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 bf15f56b44..39cf7d4222 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; } |