From 407b527a5565af1064459a0e1ad8b516249f8b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 29 Mar 2020 00:43:21 -0400 Subject: [PATCH] [XPTools] Fix linux crash bug, make Cancel button close Experiences floater --- indra/newview/llpanelexperiencepicker.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp index 38772f5b6..d27393d25 100644 --- a/indra/newview/llpanelexperiencepicker.cpp +++ b/indra/newview/llpanelexperiencepicker.cpp @@ -32,6 +32,7 @@ #include "lllineeditor.h" #include "llfloaterexperienceprofile.h" +#include "llfloaterexperiences.h" //#include "llfloaterreg.h" #include "lluictrlfactory.h" #include "llscrolllistctrl.h" @@ -287,7 +288,7 @@ void LLPanelExperiencePicker::onBtnSelect() void LLPanelExperiencePicker::onBtnClose() { - LLFloater* floater = static_cast(getParent()); + LLFloater* floater = mSelectionCallback ? static_cast(getParent()) : LLFloaterExperiences::findInstance(); if (floater) { floater->close();