diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
| commit | fbc414c02b80da1c0c5c1ebbbbcb84958938be6e (patch) | |
| tree | 27a1ff7592fa9f9de9e0f3d228076c59174bdd41 /indra/newview/llfloaterimnearbychat.h | |
| parent | 12554bffb34895533ed11013a780bfa088756a67 (diff) | |
| parent | 39ff545bab2c1e05b7b9fe14ee99828795f1f78f (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.h')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h index a38824dc78..f4213eda5a 100644 --- a/indra/newview/llfloaterimnearbychat.h +++ b/indra/newview/llfloaterimnearbychat.h @@ -83,8 +83,8 @@ public: protected: static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str); - static void onChatBoxKeystroke(LLTextEditor* caller, void* userdata); - static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata); + void onChatBoxKeystroke(); + void onChatBoxFocusLost(); void onChatBoxFocusReceived(); void sendChat( EChatType type ); |