diff options
| author | Richard Linden <none@none> | 2011-10-25 12:44:04 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-25 12:44:04 -0700 |
| commit | 35b8f7b15ccd1f7a9efd7f5e71b2481ff5245693 (patch) | |
| tree | 32ca3e54d6c6c0d578eb9de15d05608ac7a23b7e /indra/newview/llnearbychatbar.cpp | |
| parent | 9ba474774706f8b3af39a46ac57dd94c5e563a0e (diff) | |
EXP-1452 FIX minimum height of NEARBY CHAT window can be circumvented by minimizing it.
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 a811332261..e7f3daa1a3 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -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); |