summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-06-03 19:46:33 -0700
committerMerov Linden <merov@lindenlab.com>2014-06-03 19:46:33 -0700
commit86d75052f65149da6bbe1ade5ea28b6f01aaba17 (patch)
treef370706050f60f04273a28d2bf733d80c74e6523 /indra/llui
parentd5cd32a2a82473d504c04b00eb105290e5d61d08 (diff)
DD-84 : Fix all active listing modification actions. Add specific message when listing will unlist. Make update skip consistency check when called from internal level (not public API).
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llfolderview.cpp2
-rwxr-xr-xindra/llui/llfolderviewmodel.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 0bfe9a803e..537f2ac4d7 100755
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -946,7 +946,7 @@ void LLFolderView::cut()
if (listener)
{
listener->cutToClipboard();
- listener->removeItem();
+ //listener->removeItem();
}
}
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index 8d98363c5f..0b968ecee9 100755
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -169,7 +169,7 @@ public:
virtual BOOL isItemCopyable() const = 0;
virtual BOOL copyToClipboard() const = 0;
- virtual BOOL cutToClipboard() const = 0;
+ virtual BOOL cutToClipboard() = 0;
virtual BOOL isClipboardPasteable() const = 0;
virtual void pasteFromClipboard() = 0;