diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-02-20 22:02:36 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-02-20 22:02:36 +0000 |
| commit | 7dada07dbaae3dfb9b1319453e51019bfff2717f (patch) | |
| tree | a7f2b84ea65c39cee31474640dd5f265c0b2f432 /indra/newview/lltexturectrl.cpp | |
| parent | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (diff) | |
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index b2f2a861ed..794281965e 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -212,7 +212,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mInventoryPanel->setAutoSelectOverride(true); mInventoryPanel->setFilterTypes(filter_types); - mInventoryPanel->setFilterPermMask(getFilterPermMask()); + //mInventoryPanel->setFilterPermMask(getFilterPermMask()); //Commented out due to no-copy texture loss. + mInventoryPanel->setFilterPermMask(immediate_filter_perm_mask); mInventoryPanel->setSelectCallback(onSelectionChange, this); mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS); mInventoryPanel->setAllowMultiSelect(FALSE); @@ -350,7 +351,8 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop( if (mod) item_perm_mask |= PERM_MODIFY; if (xfer) item_perm_mask |= PERM_TRANSFER; - PermissionMask filter_perm_mask = getFilterPermMask(); + //PermissionMask filter_perm_mask = getFilterPermMask(); Commented out due to no-copy texture loss. + PermissionMask filter_perm_mask = mImmediateFilterPermMask; if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask ) { if (drop) @@ -729,7 +731,7 @@ void LLFloaterTexturePicker::onApplyImmediateCheck(LLUICtrl* ctrl, void *user_da void LLFloaterTexturePicker::updateFilterPermMask() { - mInventoryPanel->setFilterPermMask( getFilterPermMask() ); + //mInventoryPanel->setFilterPermMask( getFilterPermMask() ); Commented out due to no-copy texture loss. } void LLFloaterTexturePicker::onSearchEdit(const LLString& search_string, void* user_data ) @@ -1252,8 +1254,9 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item) if (mod) item_perm_mask |= PERM_MODIFY; if (xfer) item_perm_mask |= PERM_TRANSFER; - PermissionMask filter_perm_mask = mCanApplyImmediately ? - mImmediateFilterPermMask : mNonImmediateFilterPermMask; +// PermissionMask filter_perm_mask = mCanApplyImmediately ? commented out due to no-copy texture loss. +// mImmediateFilterPermMask : mNonImmediateFilterPermMask; + PermissionMask filter_perm_mask = mImmediateFilterPermMask; if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask ) { if(mDragCallback) |