summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-11-01 19:23:32 +0200
committerPaul ProductEngine <pguslisty@productengine.com>2011-11-01 19:23:32 +0200
commit3ae3d04e7e73f414a2e17c1be7cf7cca4f894c72 (patch)
tree85f42a751b3fc51a885fef8567751805762b0f42 /indra/newview
parentd86def6f03acc3b4a07a30a2f7912e6dc35edf27 (diff)
EXP-1452 FIXED (minimum height of NEARBY CHAT window can be circumvented by minimizing it.)
Reason: visibility state of chat was always set to true when floater unminimized Solution: save visibility state of the chat to restore it after floater unminimized
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnearbychatbar.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 4674c85324..6e22c7fea0 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -403,8 +403,16 @@ void LLNearbyChatBar::setMinimized(BOOL b)
{
if (b != LLFloater::isMinimized())
{
+ LLView* nearby_chat = getChildView("nearby_chat");
+
+ static bool is_visible = nearby_chat->getVisible();
+ if (b)
+ {
+ is_visible = nearby_chat->getVisible();
+ }
+
+ nearby_chat->setVisible(b ? false : is_visible);
LLFloater::setMinimized(b);
- getChildView("nearby_chat")->setVisible(!b);
}
}