livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after editing texture

meow-7.2.2
maxim_productengine 2019-01-04 10:57:49 +02:00
parent 9a0f376708
commit ab428e194e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lltexturectrl.cpp
View File

@ -1096,6 +1096,10 @@ void LLTextureCtrl::setVisible( BOOL visible )
void LLTextureCtrl::setEnabled( BOOL enabled )
{
LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
if( floaterp )
{
floaterp->setActive(enabled);
}
if( enabled )
{
std::string tooltip;
@ -1110,11 +1114,6 @@ void LLTextureCtrl::setEnabled( BOOL enabled )
closeDependentFloater();
}
if( floaterp )
{
floaterp->setActive(enabled);
}
mCaption->setEnabled( enabled );
LLView::setEnabled( enabled );
@ -1215,9 +1214,10 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
void LLTextureCtrl::closeDependentFloater()
{
LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
if( floaterp )
if( floaterp && floaterp->isInVisibleChain())
{
floaterp->setOwner(NULL);
floaterp->setVisible(FALSE);
floaterp->closeFloater();
}
}