diff options
author | Jacek Antonelli | 2009-01-16 19:40:41 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-16 19:41:58 -0600 |
commit | a9956c4a1f8d2aaaa513e100d954609f2b151baa (patch) | |
tree | 05b2dfff634079b19382a5c8c942118007da1b44 | |
parent | Fixed texture picker not showing textures. (diff) | |
download | meta-impy-a9956c4a1f8d2aaaa513e100d954609f2b151baa.zip meta-impy-a9956c4a1f8d2aaaa513e100d954609f2b151baa.tar.gz meta-impy-a9956c4a1f8d2aaaa513e100d954609f2b151baa.tar.bz2 meta-impy-a9956c4a1f8d2aaaa513e100d954609f2b151baa.tar.xz |
Fixed Resident chooser not showing calling cards.
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/newview/llfloateravatarpicker.cpp | 2 |
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 @@ | |||
1 | 2009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-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); |