Merge branch 'filter-fixes' into next

1 files changed, 57 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9cb5453..4e74ac3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2009-01-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llpanelinventory.cpp:
+        LLFolderViewEventListener has type NIT_FOLDER.
+        This fixes folders always showing when filtering.
+
+
 2009-01-17  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llfolderview.cpp:
@@ -19,6 +26,27 @@
         Fixed texture picker not showing textures.
 
 
+        * linden/indra/newview/llinventoryview.cpp: 
+        Cosmetic code cleanup in LLInventoryViewFinder.
+        
+
+        * linden/indra/newview/llinventoryview.cpp:
+        Removed some dead code in LLInventoryViewFinder.
+
+
+        * linden/indra/newview/llinventoryview.cpp:
+        Removed now-useless LLInventoryViewFinder::draw().
+        * linden/indra/newview/llinventoryview.h:
+        Ditto.
+
+
+        * linden/indra/newview/llinventoryview.cpp:
+        Use UI callbacks to initiate rebuilding filter.
+        Instead of rebuilding from draw() every frame.
+        * linden/indra/newview/llinventoryview.h:
+        Ditto.
+
+
 2009-01-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llvoavatar.cpp:
@@ -26,6 +54,35 @@
         Patch posted by CG Linden.
 
 
+        * linden/indra/newview/llfolderview.cpp:
+        Fixed folders expanding when Show Filters is opened.
+
+
+        * linden/indra/newview/llinventoryview.cpp:
+        Simplified rebuildFilter() a bit.
+
+
+        * linden/indra/newview/llinventoryview.cpp:
+        LLInventoryViewFinder::rebuildFilter().
+        Refactored from draw().
+
+        * linden/indra/newview/llinventoryview.h:
+        Ditto.
+
+
+2009-01-14  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llinventoryview.cpp:
+        Don't show empty folders when using filter.
+        This is the old behavior, but I had broken it.
+
+
+        * linden/indra/llinventory/llinventorytype.h:
+        Added inventory ntype for folders.
+        * linden/indra/llinventory/llinventory.cpp:
+        Ditto.
+
+
 2009-01-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/cmake/GStreamer.cmake: