aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateravatarpicker.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-09 04:24:29 -0700
committerMcCabe Maxsted2009-06-09 04:24:29 -0700
commitb87f003af267e416899fcfae116a2acc57ee370f (patch)
tree892eb39e833e03eab23f4e811d3c8667e82d0ab3 /linden/indra/newview/llfloateravatarpicker.cpp
parentBackported LL's version of VWR-2681 from 1.23 (diff)
downloadmeta-impy-b87f003af267e416899fcfae116a2acc57ee370f.zip
meta-impy-b87f003af267e416899fcfae116a2acc57ee370f.tar.gz
meta-impy-b87f003af267e416899fcfae116a2acc57ee370f.tar.bz2
meta-impy-b87f003af267e416899fcfae116a2acc57ee370f.tar.xz
Fixed the Resident Chooser showing hair instead of calling cards
Diffstat (limited to 'linden/indra/newview/llfloateravatarpicker.cpp')
-rw-r--r--linden/indra/newview/llfloateravatarpicker.cpp3
1 files changed, 2 insertions, 1 deletions
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 @@
39#include "llfocusmgr.h" 39#include "llfocusmgr.h"
40#include "llinventoryview.h" 40#include "llinventoryview.h"
41#include "llinventorymodel.h" 41#include "llinventorymodel.h"
42#include "llinventorytype.h"
42#include "lllineeditor.h" 43#include "lllineeditor.h"
43#include "llscrolllistctrl.h" 44#include "llscrolllistctrl.h"
44#include "lltextbox.h" 45#include "lltextbox.h"
@@ -128,7 +129,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
128 getChild<LLScrollListCtrl>("SearchResults")->addCommentText(getString("no_results")); 129 getChild<LLScrollListCtrl>("SearchResults")->addCommentText(getString("no_results"));
129 130
130 LLInventoryPanel* inventory_panel = getChild<LLInventoryPanel>("InventoryPanel"); 131 LLInventoryPanel* inventory_panel = getChild<LLInventoryPanel>("InventoryPanel");
131 inventory_panel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD); 132 inventory_panel->setFilterTypes(LLInventoryType::NIT_CALLCARD);
132 inventory_panel->setFollowsAll(); 133 inventory_panel->setFollowsAll();
133 inventory_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); 134 inventory_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
134 inventory_panel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD); 135 inventory_panel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD);