Made experience picker be created fresh every time the Add button is clicked, for ACME-1526

1 files changed, 5 insertions, 7 deletions

diff --git a/indra/newview/llpanelexperiencelisteditor.cpp b/indra/newview/llpanelexperiencelisteditor.cpp
index cc44b7a339..3561268063 100644
--- a/indra/newview/llpanelexperiencelisteditor.cpp
+++ b/indra/newview/llpanelexperiencelisteditor.cpp
@@ -106,15 +106,13 @@ void LLPanelExperienceListEditor::onAdd()
 {
 	if(!mPicker.isDead())
 	{
-		mPicker.get()->setFrontmost(TRUE);
+		mPicker.markDead();
 	}
-	else
-	{
-		mKey.generateNewID();
 
-		LLFloaterExperiencePicker* picker=LLFloaterExperiencePicker::show(boost::bind(&LLPanelExperienceListEditor::addExperienceIds, this, _1), mKey, FALSE, TRUE, mFilters, mAdd);
-		mPicker = picker->getDerivedHandle<LLFloaterExperiencePicker>();
-	}
+	mKey.generateNewID();
+
+	LLFloaterExperiencePicker* picker=LLFloaterExperiencePicker::show(boost::bind(&LLPanelExperienceListEditor::addExperienceIds, this, _1), mKey, FALSE, TRUE, mFilters, mAdd);
+	mPicker = picker->getDerivedHandle<LLFloaterExperiencePicker>();
 }