diff options
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/newview/lltexturectrl.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 6f432ee..d98ae13 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,9 @@ | |||
1 | 2009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/newview/lltexturectrl.cpp: | ||
4 | Fixed texture picker not showing textures. | ||
5 | |||
6 | |||
1 | 2009-01-15 Jacek Antonelli <jacek.antonelli@gmail.com> | 7 | 2009-01-15 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 8 | ||
3 | * linden/indra/newview/llvoavatar.cpp: | 9 | * linden/indra/newview/llvoavatar.cpp: |
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp index 382a4f3..6b84be4 100644 --- a/linden/indra/newview/lltexturectrl.cpp +++ b/linden/indra/newview/lltexturectrl.cpp | |||
@@ -237,11 +237,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( | |||
237 | 237 | ||
238 | if(mInventoryPanel) | 238 | if(mInventoryPanel) |
239 | { | 239 | { |
240 | U32 filter_types = 0x0; | 240 | mInventoryPanel->setFilterTypes( LLInventoryType::NIT_IMAGE ); |
241 | filter_types |= 0x1 << LLInventoryType::IT_TEXTURE; | ||
242 | filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT; | ||
243 | |||
244 | mInventoryPanel->setFilterTypes(filter_types); | ||
245 | //mInventoryPanel->setFilterPermMask(getFilterPermMask()); //Commented out due to no-copy texture loss. | 241 | //mInventoryPanel->setFilterPermMask(getFilterPermMask()); //Commented out due to no-copy texture loss. |
246 | mInventoryPanel->setFilterPermMask(immediate_filter_perm_mask); | 242 | mInventoryPanel->setFilterPermMask(immediate_filter_perm_mask); |
247 | mInventoryPanel->setSelectCallback(onSelectionChange, this); | 243 | mInventoryPanel->setSelectCallback(onSelectionChange, this); |