diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-26 16:32:38 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-26 16:32:38 +0200 |
commit | 35b5b5e2a3dceaf98fdf770d971c45b1c80116ed (patch) | |
tree | 3f34f5deff668a9a0001f79560b3823dd48d6f49 /indra/newview/llnearbychatbar.h | |
parent | e962b8418f8a37c1d18743c31199dd9c33d5c74b (diff) | |
parent | 379517ce5e1535b20a94ef3a581e1b25223f8798 (diff) |
merge
--HG--
branch : product-engine
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); |