summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-26 11:51:52 -0700
committerRichard Linden <none@none>2011-10-26 11:51:52 -0700
commitb0df4f12040152afe0813875eddfe83a078079a2 (patch)
tree229b608b035ab9d4b7bbc1529a8a70bbeb735676 /indra/newview/llnearbychatbar.cpp
parent24ab1e3f5413514a81e86e3c930a2e2a05bbe3eb (diff)
EXP-1461 FIX Incoming Nearby chat not visible in chat toasts/bubbles to user when chat window is minimized with chat history opened
made minimizing and unminimizing nearby chat floater do the right thing
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r--indra/newview/llnearbychatbar.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index e7f3daa1a3..4674c85324 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -399,6 +399,15 @@ void LLNearbyChatBar::onToggleNearbyChatPanel()
}
}
+void LLNearbyChatBar::setMinimized(BOOL b)
+{
+ if (b != LLFloater::isMinimized())
+ {
+ LLFloater::setMinimized(b);
+ getChildView("nearby_chat")->setVisible(!b);
+ }
+}
+
void LLNearbyChatBar::onChatBoxCommit()
{
if (mChatBox->getText().length() > 0)