aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-16 19:33:06 -0600
committerJacek Antonelli2009-01-16 19:41:48 -0600
commitad7a316922454a103071066ee95911e91f3e9b08 (patch)
treea18f9718fe07ccb63a03e995c1bec55e8df32eaf /linden
parentVWR-8012: Avatars rendered too dark. (diff)
downloadmeta-impy-ad7a316922454a103071066ee95911e91f3e9b08.zip
meta-impy-ad7a316922454a103071066ee95911e91f3e9b08.tar.gz
meta-impy-ad7a316922454a103071066ee95911e91f3e9b08.tar.bz2
meta-impy-ad7a316922454a103071066ee95911e91f3e9b08.tar.xz
Fixed texture picker not showing textures.
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/lltexturectrl.cpp6
1 files changed, 1 insertions, 5 deletions
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);