From b87f003af267e416899fcfae116a2acc57ee370f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 9 Jun 2009 04:24:29 -0700 Subject: Fixed the Resident Chooser showing hair instead of calling cards --- ChangeLog.txt | 7 ++++++- linden/indra/newview/llfloateravatarpicker.cpp | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 9489b6c..cc2de88 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,7 +10,7 @@ modified: linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml - *Backported LL's version of VWR-2681 from 1.23. + * Backported LL's version of VWR-2681 from 1.23. modified: indra/newview/app_settings/settings.xml modified: indra/newview/llfloateravatarpicker.cpp @@ -23,6 +23,11 @@ modified: indra/newview/llworld.h modified: indra/newview/pipeline.cpp modified: indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml + + + * Fixed the Resident Chooser showing hair instead of calling cards. + + modified: indra/newview/llfloateravatarpicker.cpp 2009-06-07 McCabe Maxsted diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp index 0bdabdd..25ce7c2 100644 --- a/linden/indra/newview/llfloateravatarpicker.cpp +++ b/linden/indra/newview/llfloateravatarpicker.cpp @@ -39,6 +39,7 @@ #include "llfocusmgr.h" #include "llinventoryview.h" #include "llinventorymodel.h" +#include "llinventorytype.h" #include "lllineeditor.h" #include "llscrolllistctrl.h" #include "lltextbox.h" @@ -128,7 +129,7 @@ BOOL LLFloaterAvatarPicker::postBuild() getChild("SearchResults")->addCommentText(getString("no_results")); LLInventoryPanel* inventory_panel = getChild("InventoryPanel"); - inventory_panel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD); + inventory_panel->setFilterTypes(LLInventoryType::NIT_CALLCARD); inventory_panel->setFollowsAll(); inventory_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); inventory_panel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD); -- cgit v1.1