summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.h
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-01-19 15:49:48 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-01-19 15:49:48 -0500
commit7e9ba401d1489ef96c5315f03332f28d62d97899 (patch)
treec2eabeb3f4f635ae49e5a3e9b07da54dad30eee2 /indra/newview/llnearbychatbar.h
parent2abb1a81c56a27eab02157851cb9e67730231bb6 (diff)
parent4c5141c5677a2e98c1331026d4e119abee6ab2ae (diff)
reconciled .hgtags
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 c2f57dc4ca..baf12a06ea 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -43,6 +43,7 @@ public:
~LLNearbyChatBar() {}
virtual BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
static LLNearbyChatBar* getInstance();
@@ -60,6 +61,7 @@ public:
static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
void showHistory();
+ void enableTranslationCheckbox(BOOL enable);
/*virtual*/void setMinimized(BOOL b);
protected: