diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-21 20:23:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-21 20:23:26 -0400 |
commit | b15dca22637b0b2c1947b758a93f51163fb48cf1 (patch) | |
tree | 80aa8e85d95dc2b2dc1085d9d504ce3ea552bf4e /indra/newview/llnearbychatbar.h | |
parent | 79dceafdfd767e264e3a21e12cb73e52f57cfe06 (diff) | |
parent | 7577ec25a066c5bb9b39978e32b8da084b1916d7 (diff) |
merge changes for storm-1095
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); |