diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
| commit | 74d199c1dd10660f72293c84888af412764f1da8 (patch) | |
| tree | 0b4c4137abde8283c5a85da08f19de1aea335c2a /indra/newview/llpanelmaininventory.cpp | |
| parent | 3c3ee709677a0c60420eae84a55a7b61113b4949 (diff) | |
| parent | 6e4e971fd27826f90c1728c7fd17242083e230fc (diff) | |
merge changes for vmrg-233
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index c3c62920d3..c11597f532 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -375,7 +375,7 @@ void LLPanelMainInventory::onClearSearch() if (mActivePanel) { mActivePanel->setFilterSubString(LLStringUtil::null); - mActivePanel->setFilterTypes(0xffffffff); + mActivePanel->setFilterTypes(0xffffffffffffffffULL); mActivePanel->setFilterLinks(LLInventoryFilter::FILTERLINK_INCLUDE_LINKS); } @@ -726,7 +726,7 @@ void LLFloaterInventoryFinder::updateElementsFromFilter() void LLFloaterInventoryFinder::draw() { LLMemType mt(LLMemType::MTYPE_INVENTORY_DRAW); - U32 filter = 0xffffffff; + U64 filter = 0xffffffffffffffffULL; BOOL filtered_by_all_types = TRUE; if (!getChild<LLUICtrl>("check_animation")->getValue()) |