summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.h
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-01-20 15:40:43 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-01-20 15:40:43 -0500
commit6298daf266369dbd3600c5fdf287f9c680b2a897 (patch)
tree270a7d6d12e444d739b85ad9d89e0001621b20a2 /indra/newview/llnearbychatbar.h
parent7c0b98aa83faacf27da2b71e186399e232a1a376 (diff)
parent0915ce7834f8e36c53e0790c2946b952a12a74c6 (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 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: