diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-12 18:13:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-12 18:13:01 -0700 |
| commit | 40ebe180a6592381804555d1c9e8df84bf35345a (patch) | |
| tree | 523d687dedb2921d30e1d553184a8caa87ee3c45 /indra/newview/llnearbychatbar.cpp | |
| parent | aa1f0215c764fa346625ace43c467a0e0f803057 (diff) | |
| parent | 1181e7c75747361e1a57f083cf82c63ef152bfc5 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index cd84275ef0..3e4228cfb6 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -109,15 +109,18 @@ BOOL LLNearbyChatBar::postBuild() return TRUE; } -void LLNearbyChatBar::applyRectControl() +bool LLNearbyChatBar::applyRectControl() { - LLFloater::applyRectControl(); - if (getRect().getHeight() > getMinHeight()) + bool rect_controlled = LLFloater::applyRectControl(); + + if (getRect().getHeight() > getMinHeight()) { getChildView("nearby_chat")->setVisible(true); mExpandedHeight = getRect().getHeight(); enableResizeCtrls(true); } + + return rect_controlled; } void LLNearbyChatBar::onChatFontChange(LLFontGL* fontp) |