From b21cc835b22616418ed599dc79f974ea23229736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sat, 28 Mar 2020 16:38:14 -0400 Subject: [PATCH] Clean up old Experience UI port code --- indra/newview/llpanelexperiencepicker.cpp | 5 ++--- indra/newview/llpanelexperiencepicker.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp index 00993d1ec..38772f5b6 100644 --- a/indra/newview/llpanelexperiencepicker.cpp +++ b/indra/newview/llpanelexperiencepicker.cpp @@ -62,13 +62,12 @@ const static std::string columnSpace = " "; /* Singu Note: We do not have injectors, so we'll have to call this function instead static LLPanelInjector t_panel_status("llpanelexperiencepicker"); */ -void* create_xp_picker(void* data) { return new LLPanelExperiencePicker(false); } -LLPanelExperiencePicker::LLPanelExperiencePicker(bool build) +LLPanelExperiencePicker::LLPanelExperiencePicker() :LLPanel() { //buildFromFile("panel_experience_search.xml"); - if (build) LLUICtrlFactory::getInstance()->buildPanel(this, "panel_experience_search.xml"); // Singu Note: Use filename in xml + LLUICtrlFactory::getInstance()->buildPanel(this, "panel_experience_search.xml"); // Singu Note: Use filename in xml setDefaultFilters(); } diff --git a/indra/newview/llpanelexperiencepicker.h b/indra/newview/llpanelexperiencepicker.h index ba3e5d299..1af7fe108 100644 --- a/indra/newview/llpanelexperiencepicker.h +++ b/indra/newview/llpanelexperiencepicker.h @@ -32,7 +32,6 @@ class LLScrollListCtrl; class LLLineEditor; -void* create_xp_picker(void* data); class LLPanelExperiencePicker final : public LLPanel { public: @@ -44,7 +43,7 @@ public: typedef std::function filter_function; typedef std::vector filter_list; - LLPanelExperiencePicker(bool build = true); + LLPanelExperiencePicker(); virtual ~LLPanelExperiencePicker(); BOOL postBuild() override;