5 files changed, 13 insertions, 11 deletions

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 ba37fa4..cb9a379 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -4552,7 +4552,7 @@ BOOL LLInventoryFilter::isNotDefault()
 
 BOOL LLInventoryFilter::isActive()
 {
-        return mFilterOps.mFilterTypes != LLInventoryType::NIT_ALL 
+        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/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;