diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
commit | b877665551343dc94ca02c84622b06518f9c23d8 (patch) | |
tree | 9ad6a76d0363b56ccb249f105d6ee72207df8864 /indra/newview/llnearbychatbar.h | |
parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
parent | 6e018f7143537af7bd9a08f1cc5c87ea4c8382c8 (diff) |
merge
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
-rw-r--r-- | indra/newview/llnearbychatbar.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index b902ff86cc..06204e6367 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -40,7 +40,7 @@ #include "llchiclet.h" #include "llvoiceclient.h" #include "lloutputmonitorctrl.h" -#include "llfloateractivespeakers.h" +#include "llspeakers.h" class LLGestureComboBox : public LLComboBox @@ -62,6 +62,9 @@ public: virtual void changed() { refreshGestures(); } protected: + + virtual void showList(); + LLFrameTimer mGestureLabelTimer; std::vector<LLMultiGesture*> mGestures; std::string mLabel; |