aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/newview/llfloateravatarpicker.cpp3
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 @@
10 modified: linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml 10 modified: linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
11 11
12 12
13 *Backported LL's version of VWR-2681 from 1.23. 13 * Backported LL's version of VWR-2681 from 1.23.
14 14
15 modified: indra/newview/app_settings/settings.xml 15 modified: indra/newview/app_settings/settings.xml
16 modified: indra/newview/llfloateravatarpicker.cpp 16 modified: indra/newview/llfloateravatarpicker.cpp
@@ -23,6 +23,11 @@
23 modified: indra/newview/llworld.h 23 modified: indra/newview/llworld.h
24 modified: indra/newview/pipeline.cpp 24 modified: indra/newview/pipeline.cpp
25 modified: indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml 25 modified: indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
26
27
28 * Fixed the Resident Chooser showing hair instead of calling cards.
29
30 modified: indra/newview/llfloateravatarpicker.cpp
26 31
27 32
282009-06-07 McCabe Maxsted <hakushakukun@gmail.com> 332009-06-07 McCabe Maxsted <hakushakukun@gmail.com>
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);