summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-02-11 14:39:05 +0200
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-02-11 14:39:05 +0200
commit9a75eeb67e9d768ad925c5d1f0e7ab180be8ee71 (patch)
tree03e2d04686ed2a7f727adb5a81cb77dca465756d
parent46294bdcaca5ea259dee95256179653779697e21 (diff)
Fix for build issue under windows
-rw-r--r--indra/newview/llinventorypanel.cpp3
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();
}
}
}