diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:36:16 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:36:16 -0700 |
commit | 6a8df364063639f342592aa40c8aa490d3f73403 (patch) | |
tree | be649cd320bf14c48b982135e58acb2353953a63 /indra/newview/llnearbychatbar.h | |
parent | b2381a039de7e0edbd643d198b85ba8e00524b6b (diff) | |
parent | 122308205b2958b27152b9dd5375554ef76dd084 (diff) |
Merge
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); |