diff options
author | Cho <cho@lindenlab.com> | 2014-04-29 00:08:06 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2014-04-29 00:08:06 +0100 |
commit | bd3ef14552886b30b3cfafa7e7a89553492af8c3 (patch) | |
tree | 57d384f1d5c1606a957c0e3c65b3587593c8fd2d /indra/newview/llfloaterexperiencepicker.h | |
parent | 6cc318fda28a878186d35c79bf5474d4d1ac66d3 (diff) |
Got experience picker working again for ACME-1420
Diffstat (limited to 'indra/newview/llfloaterexperiencepicker.h')
-rw-r--r-- | indra/newview/llfloaterexperiencepicker.h | 11 |
1 files changed, 1 insertions, 10 deletions
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<void (const uuid_vec_t&)> select_callback_t; // filter function for experiences, return true if the experience should be hidden. typedef boost::function<bool (const LLSD&)> filter_function; typedef std::vector<filter_function> 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 <class IT> - 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 <LLView> mFrustumOrigin; F32 mContextConeOpacity; |