summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-19 18:14:55 -0700
committerMerov Linden <merov@lindenlab.com>2012-03-19 18:14:55 -0700
commitb615a553955447cccf8f5b6af60410d4bb3c89a2 (patch)
tree5f5b7d415816305a354e38c9b33f35cf84791946 /indra/newview/llpanelobjectinventory.cpp
parent5f90875a9e92c7c92f92a32e64908a776fce64c6 (diff)
parent86c572ad63f0cf222050e807899e80ea5802e1d7 (diff)
EXP-1841 : Pull the whole Cut and Paste feature in viewer-experience
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index f3ecba7185..1ca24f3031 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -124,7 +124,7 @@ public:
virtual void move(LLFolderViewEventListener* parent_listener);
virtual BOOL isItemCopyable() const;
virtual BOOL copyToClipboard() const;
- virtual void cutToClipboard();
+ virtual BOOL cutToClipboard() const;
virtual BOOL isClipboardPasteable() const;
virtual void pasteFromClipboard();
virtual void pasteLinkFromClipboard();
@@ -524,8 +524,9 @@ BOOL LLTaskInvFVBridge::copyToClipboard() const
return FALSE;
}
-void LLTaskInvFVBridge::cutToClipboard()
+BOOL LLTaskInvFVBridge::cutToClipboard() const
{
+ return FALSE;
}
BOOL LLTaskInvFVBridge::isClipboardPasteable() const