merged in jacek/next

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6218f34..a920df4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -13,6 +13,11 @@
         Fixed copy_win_libs.
 
 
+        Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/llinventoryview.cpp:
+        Likely fix for inventory folders re-opening. [#98]
+
+
 2009-02-24  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 1e16b92..a318f5d 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1125,7 +1125,7 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data)
         else if (view->getString("filter_type_all") == item_type)
         {
                 // Show all types
-                filter_type = 0xffffffff;
+                filter_type = LLInventoryType::NIT_ALL;
         }
 
         else