diff options
Diffstat (limited to 'indra/newview/llfloaterexperiencepicker.cpp')
| -rw-r--r-- | indra/newview/llfloaterexperiencepicker.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp index fe7854b3a5..93eaa6b64b 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 @@ -46,30 +46,30 @@ 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<LLFloaterExperiencePicker>("experience_search", key); - if (!floater) - { - LL_WARNS() << "Cannot instantiate experience picker" << LL_ENDL; - return NULL; - } + LLFloaterExperiencePicker* floater = + LLFloaterReg::showTypedInstance<LLFloaterExperiencePicker>("experience_search", key); + if (!floater) + { + LL_WARNS() << "Cannot instantiate experience picker" << LL_ENDL; + return NULL; + } - if (floater->mSearchPanel) - { - floater->mSearchPanel->mSelectionCallback = callback; - floater->mSearchPanel->mCloseOnSelect = close_on_select; - floater->mSearchPanel->setAllowMultiple(allow_multiple); - floater->mSearchPanel->setDefaultFilters(); - floater->mSearchPanel->addFilters(filters.begin(), filters.end()); - floater->mSearchPanel->filterContent(); - } + if (floater->mSearchPanel) + { + floater->mSearchPanel->mSelectionCallback = callback; + floater->mSearchPanel->mCloseOnSelect = close_on_select; + floater->mSearchPanel->setAllowMultiple(allow_multiple); + floater->mSearchPanel->setDefaultFilters(); + floater->mSearchPanel->addFilters(filters.begin(), filters.end()); + floater->mSearchPanel->filterContent(); + } - if(frustumOrigin) - { - floater->mFrustumOrigin = frustumOrigin->getHandle(); - } + if(frustumOrigin) + { + floater->mFrustumOrigin = frustumOrigin->getHandle(); + } - return floater; + return floater; } void LLFloaterExperiencePicker::drawFrustum() @@ -80,29 +80,29 @@ void LLFloaterExperiencePicker::drawFrustum() void LLFloaterExperiencePicker::draw() { - drawFrustum(); - LLFloater::draw(); + drawFrustum(); + LLFloater::draw(); } LLFloaterExperiencePicker::LLFloaterExperiencePicker( const LLSD& key ) - :LLFloater(key) - ,mSearchPanel(NULL) - ,mContextConeOpacity(0.f) - ,mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA) - ,mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA) - ,mContextConeFadeTime(CONTEXT_CONE_FADE_TIME) + :LLFloater(key) + ,mSearchPanel(NULL) + ,mContextConeOpacity(0.f) + ,mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA) + ,mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA) + ,mContextConeFadeTime(CONTEXT_CONE_FADE_TIME) { } LLFloaterExperiencePicker::~LLFloaterExperiencePicker() { - gFocusMgr.releaseFocusIfNeeded( this ); + gFocusMgr.releaseFocusIfNeeded( this ); } BOOL LLFloaterExperiencePicker::postBuild() { - mSearchPanel = new LLPanelExperiencePicker(); - addChild(mSearchPanel); - mSearchPanel->setOrigin(0, 0); - return LLFloater::postBuild(); + mSearchPanel = new LLPanelExperiencePicker(); + addChild(mSearchPanel); + mSearchPanel->setOrigin(0, 0); + return LLFloater::postBuild(); } |