summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-10-11 16:17:23 -0700
committerleyla_linden <none@none>2011-10-11 16:17:23 -0700
commit9f0890fc3a6931562843e4597c009778424ee5bc (patch)
tree72271f9187731f6d5ef7e57dac1fecb10e2d6370 /indra/newview/llnearbychatbar.cpp
parentc1a9ca33b27f4e741eeacf781a09156009167ad3 (diff)
EXP-1293 Nearby chat toasts no longer appear.
EXP-1316 Minimized Snapshot floater has a snapshot preview image attached below. EXP-1318 Clicking on nearby chat toasts should bring up Nearby Chat history
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();