summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-10-11 16:18:24 -0700
committerleyla_linden <none@none>2011-10-11 16:18:24 -0700
commit7a13cde7604977b32a9f3a027a0ce5b64d52ad9c (patch)
tree5976f4729e2b082b9dac4fe3683d94f7509c13e8 /indra/newview/llnearbychatbar.cpp
parentca9ea840951bcfeaf46f07c9ee0974408c21792a (diff)
parent9f0890fc3a6931562843e4597c009778424ee5bc (diff)
Merge
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r--indra/newview/llnearbychatbar.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 3073a19d83..cd84275ef0 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -135,6 +135,16 @@ LLNearbyChatBar* LLNearbyChatBar::getInstance()
return LLFloaterReg::getTypedInstance<LLNearbyChatBar>("chat_bar");
}
+void LLNearbyChatBar::showHistory()
+{
+ if (!getChildView("nearby_chat")->getVisible())
+ {
+ onToggleNearbyChatPanel();
+ }
+
+ openFloater();
+}
+
void LLNearbyChatBar::draw()
{
displaySpeakingIndicator();