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

CHUI-121 FIXED showing chat participants list only in torn off IM floaters.

meow-7.2.2
Seth ProductEngine 2012-05-18 20:50:50 +03:00
parent acbce32489
commit a572f31ffb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llimfloater.cpp
View File

@ -1279,9 +1279,17 @@ void LLIMFloater::updateHeaderAndToolbar()
}
}
bool is_control_panel_visible = false;
if (mControlPanel)
{
// Control panel should be visible only in torn off floaters.
is_control_panel_visible = !is_hosted && gSavedSettings.getBOOL("IMShowControlPanel");
mControlPanel->getParent()->setVisible(is_control_panel_visible);
}
// Display collapse image (<<) if the floater is hosted
// or if it is torn off but has an open control panel.
bool is_expanded = is_hosted || (mControlPanel && mControlPanel->getParent()->getVisible());
bool is_expanded = is_hosted || is_control_panel_visible;
mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon"));
LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(mSessionID);