summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-11 17:19:29 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-11 17:19:29 -0700
commita90a4b7b99b383490e594e2cdf1181d13e0c0f06 (patch)
tree0e34d74e7822e9766d186ba9113db2c72fa3a839 /indra/newview/llnearbychatbar.h
parent3c06bb26b0fc4204945020c37f00dbdf0ff9338b (diff)
parent48f7514fbd0db8266b8c70263d9f16f6f4201320 (diff)
Merge
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r--indra/newview/llnearbychatbar.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index a6fd6e5665..5a7edac1bb 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -59,6 +59,8 @@ public:
static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
+ void showHistory();
+
protected:
static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);