aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llfloateravatarpicker.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index d98ae13..09df22e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
12009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llfloateravatarpicker.cpp:
4 Fixed Resident chooser not showing calling cards.
5
6
3 * linden/indra/newview/lltexturectrl.cpp: 7 * linden/indra/newview/lltexturectrl.cpp:
4 Fixed texture picker not showing textures. 8 Fixed texture picker not showing textures.
5 9
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()
118 mInventoryPanel = getChild<LLInventoryPanel>("Inventory Panel"); 118 mInventoryPanel = getChild<LLInventoryPanel>("Inventory Panel");
119 if(mInventoryPanel) 119 if(mInventoryPanel)
120 { 120 {
121 mInventoryPanel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD); 121 mInventoryPanel->setFilterTypes(LLInventoryType::NIT_CALLCARD);
122 mInventoryPanel->setFollowsAll(); 122 mInventoryPanel->setFollowsAll();
123 mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); 123 mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
124 mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD); 124 mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD);