diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-04 14:29:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-04 14:29:43 -0500 |
| commit | c58e152236abfc1c414eb6c64783334ca9555b58 (patch) | |
| tree | d44dbd26c09193737c98dc5b934044288634a630 /indra/newview/llfolderview.cpp | |
| parent | f700be39e7dc9b9e6e56031818b94c329383a097 (diff) | |
EXT-4801 : hitting trash button for trashed items does not delete item
EXT-4957 : add const correctness for LLFolderViewEventListener::isItemRemovable
This checkin affects several files but is a lot less scary than it looks. It's mostly to add const correctness, and to rename isInTrash to isItemInTrash so that its naming is consistent with isItemRemovable/isItemMovable.
The only functionality change is to disable the trash button when an item is already in the trash.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index c6135d3bc3..5c65b2c293 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1272,8 +1272,7 @@ BOOL LLFolderView::canCut() const const LLFolderViewItem* item = *selected_it; const LLFolderViewEventListener* listener = item->getListener(); - // *WARKAROUND: it is too many places where the "isItemRemovable" method should be changed with "const" modifier - if (!listener || !(const_cast<LLFolderViewEventListener*>(listener))->isItemRemovable()) + if (!listener || !listener->isItemRemovable()) { return FALSE; } |