From 89ea1cbc7acee8878c36a5795dd3df12a913c513 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 17 Jun 2014 18:00:25 +0100
Subject: Made experience picker be created fresh every time the Add button is
 clicked, for ACME-1526

---
 indra/newview/llpanelexperiencelisteditor.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'indra')

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>();
 }
 
 
-- 
cgit v1.2.3