10 files changed, 118 insertions, 83 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index e492889..4507d94 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -176,6 +176,11 @@ LLInventoryType::NType calc_ntype(
                 case LLInventoryType::IT_ATTACHMENT:
                         return LLInventoryType::NIT_OBJECT;
 
+                        // FOLDERS
+                case LLInventoryType::IT_CATEGORY:
+                case LLInventoryType::IT_ROOT_CATEGORY:
+                        return LLInventoryType::NIT_FOLDER;
+
                         // UNKNOWN TYPE!
                 default:
                         return LLInventoryType::NIT_NONE;
diff --git a/linden/indra/llinventory/llinventorytype.h b/linden/indra/llinventory/llinventorytype.h
index f228cd0..c81733e 100644
--- a/linden/indra/llinventory/llinventorytype.h
+++ b/linden/indra/llinventory/llinventorytype.h
@@ -152,8 +152,11 @@ public:
                 /* Objects */
                 NIT_OBJECT           =  1 << 24,
 
+    /* Folders ("Categories" in the old type system) */
+    NIT_FOLDER           =  1 << 25,
+
                 /* Bitwise OR-ing of all the above */
-                NIT_ALL              =  0x1ffffff,
+                NIT_ALL              =  0x3ffffff,
         };
 
 
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index da1b9b7..216eea7 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -118,7 +118,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
         mInventoryPanel = getChild<LLInventoryPanel>("Inventory Panel");
         if(mInventoryPanel)
         {
-                mInventoryPanel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD);
+                mInventoryPanel->setFilterTypes(LLInventoryType::NIT_CALLCARD);
                 mInventoryPanel->setFollowsAll();
                 mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
                 mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD);
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 58d0c42..cb9a379 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -4479,7 +4479,7 @@ LLInventoryFilter::LLInventoryFilter(const std::string& name) :
         mModified(FALSE),
         mNeedTextRebuild(TRUE)
 {
-        mFilterOps.mFilterTypes = 0xffffffff;
+        mFilterOps.mFilterTypes = LLInventoryType::NIT_ALL;
         mFilterOps.mMinDate = time_min();
         mFilterOps.mMaxDate = time_max();
         mFilterOps.mHoursAgo = 0;
@@ -4552,7 +4552,7 @@ BOOL LLInventoryFilter::isNotDefault()
 
 BOOL LLInventoryFilter::isActive()
 {
-        return mFilterOps.mFilterTypes != 0xffffffff 
+        return mFilterOps.mFilterTypes != LLInventoryType::NIT_ALL
                 || mFilterSubString.size() 
                 || mFilterOps.mPermissions != PERM_NONE 
                 || mFilterOps.mMinDate != time_min()
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 3f8ff3d..eafa06c 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -248,9 +248,13 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
         {
                         addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::sSansSerif));
 
-                        LLUIImagePtr item_icon = get_item_icon(mInventoryOffer->mType,
-                                                                                                        LLInventoryType::IT_TEXTURE,
-                                                                                                        0, FALSE);
+
+                        LLAssetType::EType atype;
+                        LLInventoryType::EType itype;
+                        atype = mInventoryOffer->mType;
+                        itype = LLInventoryType::defaultForAssetType( atype );
+
+                        LLUIImagePtr item_icon = get_item_icon(atype, itype, 0, FALSE);
 
 
                         x += LABEL_WIDTH + HPAD;
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 52c3b7e..a265906 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -118,6 +118,21 @@ LLInventoryViewFinder::LLInventoryViewFinder(const std::string& name,
 
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_view_finder.xml");
 
+
+        childSetCommitCallback("check_animation",    onCheckFilterType, this);
+        childSetCommitCallback("check_bodypart",     onCheckFilterType, this);
+        childSetCommitCallback("check_calling_card", onCheckFilterType, this);
+        childSetCommitCallback("check_clothing",     onCheckFilterType, this);
+        childSetCommitCallback("check_gesture",      onCheckFilterType, this);
+        childSetCommitCallback("check_landmark",     onCheckFilterType, this);
+        childSetCommitCallback("check_notecard",     onCheckFilterType, this);
+        childSetCommitCallback("check_object",       onCheckFilterType, this);
+        childSetCommitCallback("check_script",       onCheckFilterType, this);
+        childSetCommitCallback("check_sound",        onCheckFilterType, this);
+        childSetCommitCallback("check_texture",      onCheckFilterType, this);
+        childSetCommitCallback("check_snapshot",     onCheckFilterType, this);
+
+
         childSetAction("All", selectAllTypes, this);
         childSetAction("None", selectNoTypes, this);
 
@@ -127,6 +142,8 @@ LLInventoryViewFinder::LLInventoryViewFinder(const std::string& name,
         mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");
         childSetCommitCallback("spin_days_ago", onTimeAgo, this);
 
+        childSetCommitCallback("check_show_empty", onCheckShowEmptyFolders, this);
+
 //      mCheckSinceLogoff   = getChild<LLSpinCtrl>("check_since_logoff");
         childSetCommitCallback("check_since_logoff", onCheckSinceLogoff, this);
 
@@ -136,6 +153,16 @@ LLInventoryViewFinder::LLInventoryViewFinder(const std::string& name,
 }
 
 
+// Callback when an inventory type checkbox is changed.
+void LLInventoryViewFinder::onCheckFilterType(LLUICtrl *ctrl, void *user_data)
+{
+        LLInventoryViewFinder *self = (LLInventoryViewFinder *)user_data;
+        if (!self) return;
+
+        self->rebuildFilter();
+}
+
+
 void LLInventoryViewFinder::onCheckSinceLogoff(LLUICtrl *ctrl, void *user_data)
 {
         LLInventoryViewFinder *self = (LLInventoryViewFinder *)user_data;
@@ -148,6 +175,8 @@ void LLInventoryViewFinder::onCheckSinceLogoff(LLUICtrl *ctrl, void *user_data)
         {
                 self->mSpinSinceHours->set(1.0f);
         }       
+
+        self->rebuildFilter();
 }
 
 void LLInventoryViewFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)
@@ -161,14 +190,27 @@ void LLInventoryViewFinder::onTimeAgo(LLUICtrl *ctrl, void *user_data)
                 since_logoff = false;
         }
         self->childSetValue("check_since_logoff", since_logoff);
+
+        self->rebuildFilter();
+}
+
+
+void LLInventoryViewFinder::onCheckShowEmptyFolders(LLUICtrl *ctrl, void *user_data)
+{
+        LLInventoryViewFinder *self = (LLInventoryViewFinder *)user_data;
+        if (!self) return;
+
+        self->rebuildFilter();
 }
 
+
 void LLInventoryViewFinder::changeFilter(LLInventoryFilter* filter)
 {
         mFilter = filter;
         updateElementsFromFilter();
 }
 
+
 void LLInventoryViewFinder::updateElementsFromFilter()
 {
         if (!mFilter)
@@ -180,113 +222,116 @@ void LLInventoryViewFinder::updateElementsFromFilter()
         LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
         U32 hours = mFilter->getHoursAgo();
 
-        // update the ui elements
+        // Update floater title
         LLFloater::setTitle(mFilter->getName());
 
-        childSetValue("check_animation", (S32) (filter_types & LLInventoryType::NIT_ANIMATION));
-        childSetValue("check_bodypart", (S32) (filter_types & LLInventoryType::NIT_BODYPART));
-        childSetValue("check_calling_card", (S32) (filter_types & LLInventoryType::NIT_CALLCARD));
-        childSetValue("check_clothing", (S32) (filter_types & LLInventoryType::NIT_CLOTHING));
-        childSetValue("check_gesture", (S32) (filter_types & LLInventoryType::NIT_GESTURE));
-        childSetValue("check_landmark", (S32) (filter_types & LLInventoryType::NIT_LANDMARK));
-        childSetValue("check_notecard", (S32) (filter_types & LLInventoryType::NIT_NOTECARD));
-        childSetValue("check_object", (S32) (filter_types & LLInventoryType::NIT_OBJECT));
-        childSetValue("check_script", (S32) (filter_types & LLInventoryType::NIT_SCRIPT_LSL2));
-        childSetValue("check_sound", (S32) (filter_types & LLInventoryType::NIT_SOUND));
-        childSetValue("check_texture", (S32) (filter_types & LLInventoryType::NIT_TEXTURE));
-        childSetValue("check_snapshot", (S32) (filter_types & LLInventoryType::NIT_SNAPSHOT));
-        childSetValue("check_show_empty", show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);
-        childSetValue("check_since_logoff", mFilter->isSinceLogoff());
-        mSpinSinceHours->set((F32)(hours % 24));
-        mSpinSinceDays->set((F32)(hours / 24));
-}
-
-void LLInventoryViewFinder::draw()
-{
-        U32 filter = 0xffffffff;
-        BOOL filtered_by_all_types = TRUE;
+        // Update type check boxes
+        childSetValue("check_animation",
+                      (S32)(filter_types & LLInventoryType::NIT_ANIMATION));
+        childSetValue("check_bodypart",
+                      (S32)(filter_types & LLInventoryType::NIT_BODYPART));
+        childSetValue("check_calling_card",
+                      (S32)(filter_types & LLInventoryType::NIT_CALLCARD));
+        childSetValue("check_clothing",
+                      (S32)(filter_types & LLInventoryType::NIT_CLOTHING));
+        childSetValue("check_gesture",
+                      (S32)(filter_types & LLInventoryType::NIT_GESTURE));
+        childSetValue("check_landmark",
+                      (S32)(filter_types & LLInventoryType::NIT_LANDMARK));
+        childSetValue("check_notecard",
+                      (S32)(filter_types & LLInventoryType::NIT_NOTECARD));
+        childSetValue("check_object",
+                      (S32)(filter_types & LLInventoryType::NIT_OBJECT));
+        childSetValue("check_script",
+                      (S32)(filter_types & LLInventoryType::NIT_SCRIPT_LSL2));
+        childSetValue("check_sound",
+                      (S32)(filter_types & LLInventoryType::NIT_SOUND));
+        childSetValue("check_texture",
+                      (S32)(filter_types & LLInventoryType::NIT_TEXTURE));
+        childSetValue("check_snapshot",
+                      (S32)(filter_types & LLInventoryType::NIT_SNAPSHOT));
+
+        // Update other check boxes
+        childSetValue("check_show_empty",
+                      show_folders == LLInventoryFilter::SHOW_ALL_FOLDERS);
+        childSetValue("check_since_logoff",
+                      mFilter->isSinceLogoff());
+
+        // Update hours and days spinners
+        mSpinSinceHours->set( (F32)(hours % 24) );
+        mSpinSinceDays->set(  (F32)(hours / 24) );
+}
+
+
+void LLInventoryViewFinder::rebuildFilter()
+{
+        U32 filter = LLInventoryType::NIT_ALL;
 
         if (!childGetValue("check_animation"))
         {
                 filter &= ~(LLInventoryType::NIT_ANIMATION);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_bodypart"))
         {
                 filter &= ~(LLInventoryType::NIT_BODYPART);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_calling_card"))
         {
                 filter &= ~(LLInventoryType::NIT_CALLCARD);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_clothing"))
         {
                 filter &= ~(LLInventoryType::NIT_CLOTHING);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_gesture"))
         {
                 filter &= ~(LLInventoryType::NIT_GESTURE);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_landmark"))
-
-
         {
                 filter &= ~(LLInventoryType::NIT_LANDMARK);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_notecard"))
         {
                 filter &= ~(LLInventoryType::NIT_NOTECARD);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_object"))
         {
                 filter &= ~(LLInventoryType::NIT_OBJECT);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_script"))
         {
                 filter &= ~(LLInventoryType::NIT_SCRIPT_LSL2);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_sound"))
         {
                 filter &= ~(LLInventoryType::NIT_SOUND);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_texture"))
         {
                 filter &= ~(LLInventoryType::NIT_TEXTURE);
-                filtered_by_all_types = FALSE;
         }
 
         if (!childGetValue("check_snapshot"))
         {
                 filter &= ~(LLInventoryType::NIT_SNAPSHOT);
-                filtered_by_all_types = FALSE;
         }
 
-  /*
-        if (!filtered_by_all_types)
+        if (filter != LLInventoryType::NIT_ALL)
         {
                 // don't include folders in filter, unless I've selected everything
-                filter &= ~(LLInventoryType::NIT_CATEGORY);
+                filter &= ~(LLInventoryType::NIT_FOLDER);
         }
-  */
 
         // update the panel, panel will update the filter
         mInventoryView->mActivePanel->setShowFolderState(getCheckShowEmpty() ?
@@ -310,8 +355,6 @@ void LLInventoryViewFinder::draw()
         mInventoryView->mActivePanel->setHoursAgo(hours);
         mInventoryView->mActivePanel->setSinceLogoff(getCheckSinceLogoff());
         mInventoryView->setFilterTextFromFilter();
-
-        LLFloater::draw();
 }
 
 void  LLInventoryViewFinder::onClose(bool app_quitting)
@@ -364,17 +407,7 @@ void LLInventoryViewFinder::selectAllTypes(void* user_data)
         self->childSetValue("check_texture", TRUE);
         self->childSetValue("check_snapshot", TRUE);
 
-/*
-        self->mCheckCallingCard->set(TRUE);
-        self->mCheckClothing->set(TRUE);
-        self->mCheckGesture->set(TRUE);
-        self->mCheckLandmark->set(TRUE);
-        self->mCheckNotecard->set(TRUE);
-        self->mCheckObject->set(TRUE);
-        self->mCheckScript->set(TRUE);
-        self->mCheckSound->set(TRUE);
-        self->mCheckTexture->set(TRUE);
-        self->mCheckSnapshot->set(TRUE);*/
+        self->rebuildFilter();
 }
 
 //static
@@ -383,20 +416,6 @@ void LLInventoryViewFinder::selectNoTypes(void* user_data)
         LLInventoryViewFinder* self = (LLInventoryViewFinder*)user_data;
         if(!self) return;
 
-        /*
-        self->childSetValue("check_animation", FALSE);
-        self->mCheckCallingCard->set(FALSE);
-        self->mCheckClothing->set(FALSE);
-        self->mCheckGesture->set(FALSE);
-        self->mCheckLandmark->set(FALSE);
-        self->mCheckNotecard->set(FALSE);
-        self->mCheckObject->set(FALSE);
-        self->mCheckScript->set(FALSE);
-        self->mCheckSound->set(FALSE);
-        self->mCheckTexture->set(FALSE);
-        self->mCheckSnapshot->set(FALSE);*/
-
-
         self->childSetValue("check_animation", FALSE);
         self->childSetValue("check_bodypart", FALSE);
         self->childSetValue("check_calling_card", FALSE);
@@ -409,6 +428,8 @@ void LLInventoryViewFinder::selectNoTypes(void* user_data)
         self->childSetValue("check_sound", FALSE);
         self->childSetValue("check_texture", FALSE);
         self->childSetValue("check_snapshot", FALSE);
+
+        self->rebuildFilter();
 }
 
 
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 80e5768..c5c8532 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -162,14 +162,18 @@ public:
         LLInventoryViewFinder(const std::string& name,
                                                 const LLRect& rect,
                                                 LLInventoryView* inventory_view);
-        virtual void draw();
+        virtual void rebuildFilter();
         virtual void onClose(bool app_quitting);
         void changeFilter(LLInventoryFilter* filter);
         void updateElementsFromFilter();
         BOOL getCheckShowEmpty();
         BOOL getCheckSinceLogoff();
 
+        /** Callback when an inventory type checkbox is changed. */
+        static void onCheckFilterType(LLUICtrl *ctrl, void *user_data);
+
         static void onTimeAgo(LLUICtrl*, void *);
+        static void onCheckShowEmptyFolders(LLUICtrl*, void *);
         static void onCheckSinceLogoff(LLUICtrl*, void *);
         static void onCloseBtn(void* user_data);
         static void selectAllTypes(void* user_data);
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index e41ecdc..7277f05 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -146,7 +146,7 @@ public:
         virtual BOOL isUpToDate() const { return TRUE; }
         virtual BOOL hasChildren() const { return FALSE; }
         virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }
-        virtual LLInventoryType::NType getNInventoryType() const { return LLInventoryType::NIT_NONE; }
+        virtual LLInventoryType::NType getNInventoryType() const { return LLInventoryType::NIT_FOLDER; }
         // LLDragAndDropBridge functionality
         virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
         virtual BOOL dragOrDrop(MASK mask, BOOL drop,
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 382a4f3..6b84be4 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -237,11 +237,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 
         if(mInventoryPanel)
         {
-                U32 filter_types = 0x0;
-                filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
-                filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
-
-                mInventoryPanel->setFilterTypes(filter_types);
+                mInventoryPanel->setFilterTypes( LLInventoryType::NIT_IMAGE );
                 //mInventoryPanel->setFilterPermMask(getFilterPermMask());  //Commented out due to no-copy texture loss.
                 mInventoryPanel->setFilterPermMask(immediate_filter_perm_mask);
                 mInventoryPanel->setSelectCallback(onSelectionChange, this);
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 327cd57..d41f72e 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5716,7 +5716,9 @@ BOOL LLVOAvatar::loadMeshNodes()
 
                 //      llinfos << "Parsing mesh data for " << type << "..." << llendl;
 
-                mesh->setColor( 0.8f, 0.8f, 0.8f, 1.0f );
+                // If this isn't set to white (1.0), avatars will *ALWAYS* be darker than their surroundings.
+                // Do not touch!!!
+                mesh->setColor( 1.0f, 1.0f, 1.0f, 1.0f );
 
                 LLPolyMesh *poly_mesh = NULL;