Fixed FIRE-331: Disabled close button on dockable flaoters is always enabled when docked

meow-7.2.2
kadah 2011-01-18 20:13:17 -08:00
parent bcb9481bd5
commit 65fda9dfb4
1 changed files with 7 additions and 1 deletions

View File

@ -1871,6 +1871,8 @@ void LLFloater::updateTitleButtons()
enabled = false;
}
}
/*KC: don't do this, see below
if (i == BUTTON_CLOSE && mButtonScale != 1.f)
{
//*HACK: always render close button for hosted floaters so
@ -1878,10 +1880,14 @@ void LLFloater::updateTitleButtons()
//closing multiple windows in the chatterbox
enabled = true;
}
*/
mButtons[i]->setEnabled(enabled);
if (enabled)
if (enabled
//KC: don't explictly force enable close button on
//hosted floaters instead drawing a disabled one
|| (i == BUTTON_CLOSE && mButtonScale != 1.f))
{
button_count++;