diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-04 13:15:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-04 13:15:48 -0400 |
| commit | aafc82668073e26e8c8a951a96bff9b1d1993262 (patch) | |
| tree | 1972c12ee782ff3635c07ee89f09f0215f55a969 /indra/newview/llconversationmodel.h | |
| parent | c9af158e36eae83f6e3eba97762369affa84848b (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/llconversationmodel.h')
| -rw-r--r-- | indra/newview/llconversationmodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index deff94ea16..af7b50802c 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -86,7 +86,7 @@ public: virtual void move( LLFolderViewModelItem* parent_listener ) { } virtual BOOL isItemCopyable() const { return FALSE; } virtual BOOL copyToClipboard() const { return FALSE; } - virtual BOOL cutToClipboard() const { return FALSE; } + virtual BOOL cutToClipboard() { return FALSE; } virtual BOOL isClipboardPasteable() const { return FALSE; } virtual void pasteFromClipboard() { } virtual void pasteLinkFromClipboard() { } |