Skip to content
Snippets Groups Projects
Commit c8499a7b authored by Merov Linden's avatar Merov Linden
Browse files

EXP-1419 : Fix the nearby chat window show/hide and height persistence within a session

parent b477f3c9
No related branches found
No related tags found
No related merge requests found
...@@ -112,14 +112,18 @@ BOOL LLNearbyChatBar::postBuild() ...@@ -112,14 +112,18 @@ BOOL LLNearbyChatBar::postBuild()
bool LLNearbyChatBar::applyRectControl() bool LLNearbyChatBar::applyRectControl()
{ {
bool rect_controlled = LLFloater::applyRectControl(); bool rect_controlled = LLFloater::applyRectControl();
if (getRect().getHeight() > getMinHeight()) LLView* nearby_chat = getChildView("nearby_chat");
if (!nearby_chat->getVisible())
{
reshape(getRect().getWidth(), getMinHeight());
enableResizeCtrls(true, true, false);
}
else
{ {
getChildView("nearby_chat")->setVisible(true);
mExpandedHeight = getRect().getHeight();
enableResizeCtrls(true); enableResizeCtrls(true);
} }
return rect_controlled; return rect_controlled;
} }
......
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