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.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'indra/newview/llfloaterexperiencepicker.cpp') diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp index 4a484463e8..60a9bdfd98 100644 --- a/indra/newview/llfloaterexperiencepicker.cpp +++ b/indra/newview/llfloaterexperiencepicker.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llfloaterexperiencepicker.cpp * @brief Implementation of llfloaterexperiencepicker * @author dolphin@lindenlab.com @@ -44,7 +44,7 @@ #include "lldraghandle.h" #include "llpanelexperiencepicker.h" -LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL closeOnSelect, LLView * frustumOrigin ) +LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL close_on_select, filter_list filters, LLView * frustumOrigin ) { LLFloaterExperiencePicker* floater = LLFloaterReg::showTypedInstance("experience_search", key); @@ -54,9 +54,13 @@ LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t ca return NULL; } - floater->mSelectionCallback = callback; - floater->mCloseOnSelect = closeOnSelect; - floater->mAllowMultiple = allow_multiple; + if (floater->mSearchPanel) + { + floater->mSearchPanel->mSelectionCallback = callback; + floater->mSearchPanel->mCloseOnSelect = close_on_select; + floater->mSearchPanel->setAllowMultiple(allow_multiple); + floater->mSearchPanel->addFilters(filters.begin(), filters.end()); + } if(frustumOrigin) { @@ -150,11 +154,5 @@ LLFloaterExperiencePicker::~LLFloaterExperiencePicker() BOOL LLFloaterExperiencePicker::postBuild() { mSearchPanel = static_cast(getChild("panel_experience_search")); - - mSearchPanel->mSelectionCallback = mSelectionCallback; - mSearchPanel->mCloseOnSelect = mCloseOnSelect; - mSearchPanel->setAllowMultiple(mAllowMultiple); - mSearchPanel->addFilters(mFilters.begin(), mFilters.end()); - return LLFloater::postBuild(); } -- cgit v1.2.3