From bd3ef14552886b30b3cfafa7e7a89553492af8c3 Mon Sep 17 00:00:00 2001 From: Cho Date: Tue, 29 Apr 2014 00:08:06 +0100 Subject: Got experience picker working again for ACME-1420 --- indra/newview/llfloaterexperiencepicker.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'indra/newview/llfloaterexperiencepicker.h') diff --git a/indra/newview/llfloaterexperiencepicker.h b/indra/newview/llfloaterexperiencepicker.h index 22bfb64ba7..29054a57db 100644 --- a/indra/newview/llfloaterexperiencepicker.h +++ b/indra/newview/llfloaterexperiencepicker.h @@ -37,33 +37,24 @@ class LLPanelExperiencePicker; class LLFloaterExperiencePicker : public LLFloater { public: - friend class LLExperiencePickerResponder; typedef boost::function select_callback_t; // filter function for experiences, return true if the experience should be hidden. typedef boost::function filter_function; typedef std::vector filter_list; - static LLFloaterExperiencePicker* show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL closeOnSelect, LLView * frustumOrigin); + static LLFloaterExperiencePicker* show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL close_on_select, filter_list filters, LLView * frustumOrigin); LLFloaterExperiencePicker(const LLSD& key); virtual ~LLFloaterExperiencePicker(); BOOL postBuild(); - template - void addFilters(IT begin, IT end){mFilters.insert(mFilters.end(), begin, end);} - virtual void draw(); private: LLPanelExperiencePicker* mSearchPanel; - select_callback_t mSelectionCallback; - filter_list mFilters; - bool mAllowMultiple; - bool mCloseOnSelect; - void drawFrustum(); LLHandle mFrustumOrigin; F32 mContextConeOpacity; -- cgit v1.2.3