diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-11 16:10:34 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-11 16:10:34 -0800 |
| commit | 2317591c93b5870acd6fdedbecc2d8050511459d (patch) | |
| tree | c79411f06b25eef8ec26e8bcf306e17787d7f121 /indra/newview/llinventorypanel.cpp | |
| parent | 279d4a95ea84ddeb32efc54deb6923202fe638a7 (diff) | |
| parent | c4bcd4f2c2578e8f165361441635ef47f51ec420 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 1357b613bb..fabcd50c7d 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -1401,8 +1401,7 @@ bool LLInventoryPanel::isSelectionRemovable() } else { - can_delete &= listener->isItemRemovable(); - can_delete &= !listener->isItemInTrash(); + can_delete &= listener->isItemRemovable() && !listener->isItemInTrash(); } } } |