diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
| commit | 19e0cc93a8af661dbac47552474a704ade600c74 (patch) | |
| tree | 5d7e539a4c98607a189c6e472732b75608379abb /indra/newview/llpanelmaininventory.cpp | |
| parent | ee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff) | |
| parent | 3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff) | |
DRTVWR-139: merge back 3.3.1-beta2 fixes
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()) |