diff options
author | Merov Linden <merov@lindenlab.com> | 2011-09-27 19:45:38 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-09-27 19:45:38 -0700 |
commit | 1bdfe7ec471efb94acc4a8f98e8084c08199c9da (patch) | |
tree | 93f844ff1083d18bd076b6f884ab0a22cbf530ae /indra/newview/llnearbychatbar.h | |
parent | 3a473bd8ca301a5cd7e0284e40da890d598d394d (diff) | |
parent | 9eef4b6c569b48975cd74ef80b1393febe1387d8 (diff) |
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r-- | indra/newview/llnearbychatbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index f4a8605e18..1d28a21ef3 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -108,8 +108,6 @@ public: virtual void draw(); - virtual void onClose(bool app_quitting); - std::string getCurrentChat(); virtual BOOL handleKeyHere( KEY key, MASK mask ); @@ -129,6 +127,8 @@ protected: void onChatBoxCommit(); void onChatFontChange(LLFontGL* fontp); + void onToggleNearbyChatPanel(); + static LLWString stripChannelNumber(const LLWString &mesg, S32* channel); EChatType processChatTypeTriggers(EChatType type, std::string &str); |