diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
commit | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch) | |
tree | a1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/newview/llnearbychatbar.h | |
parent | 27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff) | |
parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r-- | indra/newview/llnearbychatbar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 96ab45071b..efddec942f 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -127,6 +127,7 @@ protected: void sendChat( EChatType type ); void onChatBoxCommit(); + void onChatFontChange(LLFontGL* fontp); static LLWString stripChannelNumber(const LLWString &mesg, S32* channel); EChatType processChatTypeTriggers(EChatType type, std::string &str); |