Skip to content
Snippets Groups Projects
Commit 35b8f7b1 authored by Richard Linden's avatar Richard Linden
Browse files

EXP-1452 FIX minimum height of NEARBY CHAT window can be circumvented by minimizing it.

parent 9ba47477
No related branches found
No related tags found
No related merge requests found
......@@ -147,12 +147,12 @@ LLNearbyChatBar* LLNearbyChatBar::getInstance()
void LLNearbyChatBar::showHistory()
{
openFloater();
if (!getChildView("nearby_chat")->getVisible())
{
onToggleNearbyChatPanel();
}
openFloater();
}
void LLNearbyChatBar::draw()
......@@ -379,7 +379,10 @@ void LLNearbyChatBar::onToggleNearbyChatPanel()
if (nearby_chat->getVisible())
{
mExpandedHeight = getRect().getHeight();
if (!isMinimized())
{
mExpandedHeight = getRect().getHeight();
}
setResizeLimits(getMinWidth(), COLLAPSED_HEIGHT);
nearby_chat->setVisible(FALSE);
reshape(getRect().getWidth(), COLLAPSED_HEIGHT);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment