Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sometimes you just like to commit stuff and watch the colors. It's so beautiful. Life is beautiful.

Browse Source 
Attempted fix on the wlf panel again. Prognosis: Fuck this shit.

aside from that, a couple fixes to other bits and pieces.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-03 05:18:18 -04:00
parent fed6bb2c8a
commit 77e268c79a
4 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/lltexturectrl.cpp
View File

@@ -399,10 +399,10 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
if (mod) item_perm_mask |= PERM_MODIFY;
if (xfer) item_perm_mask |= PERM_TRANSFER;
// <edit>
//PermissionMask filter_perm_mask = mImmediateFilterPermMask;
//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
// </edit>
PermissionMask filter_perm_mask = mImmediateFilterPermMask;
if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
{
if (drop)
{
@@ -412,12 +412,10 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
*accept = ACCEPT_YES_SINGLE;
}
// <edit>
/*else
else
{
*accept = ACCEPT_NO;
}*/
// </edit>
}
}
else
{
@@ -1151,11 +1149,9 @@ void LLTextureCtrl::setEnabled( BOOL enabled )
mCaption->setEnabled( enabled );
mEnable = enabled;
// <edit>
/*
LLView::setEnabled( enabled );
*/
// </edit>
}
void LLTextureCtrl::setValid(BOOL valid )