diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 10:10:10 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 10:10:10 +0100 |
commit | 4a41273078da14463fe86fe9abf2a2d8946d910e (patch) | |
tree | b1c9e9df34912366b3020b076b0be19c024c5963 /indra/newview/llnearbychatbar.h | |
parent | 3d14fe23fcf7f05cb207c34fdfb13c54c668eba1 (diff) | |
parent | f7009abf6589d4cdb86361e04293bf989ba7f140 (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 83c174fd10..0eaa60ce81 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -68,7 +68,7 @@ public: ~LLGestureComboList(); - LLCtrlListInterface* getListInterface() { return (LLCtrlListInterface*)mList; }; + LLCtrlListInterface* getListInterface(); virtual void showList(); virtual void hideList(); virtual BOOL handleKeyHere(KEY key, MASK mask); |