From 921a93999bf78dcff9da3fa6cd7e1ec01d998d02 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 5 Jun 2014 03:11:01 +0100
Subject: Fixed double vision in experience picker floater for ACME-1473

---
 indra/newview/llfloaterexperiencepicker.cpp                      | 4 +++-
 indra/newview/skins/default/xui/en/floater_experience_search.xml | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp
index da65e50244..04a2d541de 100644
--- a/indra/newview/llfloaterexperiencepicker.cpp
+++ b/indra/newview/llfloaterexperiencepicker.cpp
@@ -153,6 +153,8 @@ LLFloaterExperiencePicker::~LLFloaterExperiencePicker()
 
 BOOL LLFloaterExperiencePicker::postBuild()
 {
-	mSearchPanel = static_cast<LLPanelExperiencePicker*>(getChild<LLUICtrl>("panel_experience_search"));
+	mSearchPanel = new LLPanelExperiencePicker();
+	addChild(mSearchPanel);
+	mSearchPanel->setOrigin(0, 0);
 	return LLFloater::postBuild();
 }
diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
index 7d7e3ba95a..15a4b5665e 100644
--- a/indra/newview/skins/default/xui/en/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -11,10 +11,4 @@
   help_topic="experiencepicker"
   title="CHOOSE EXPERIENCE"
   width="350">
-
-  <panel
-    filename="panel_experience_search.xml"
-    class="llpanelexperiencepicker"
-    follows="all"
-    name="panel_experience_search"/>
 </floater>
-- 
cgit v1.2.3