diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/newview/llnearbychatbar.h | |
parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r-- | indra/newview/llnearbychatbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 559c1ee091..dd467d7978 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -70,7 +70,7 @@ public: LLCtrlListInterface* getListInterface() { return (LLCtrlListInterface*)mList; }; virtual void showList(); virtual void hideList(); - virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); + virtual BOOL handleKeyHere(KEY key, MASK mask); S32 getCurrentIndex() const; void onItemSelected(const LLSD& data); |