From 857c7fd8967b360eb8daef63c512c3c194aa812b Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 10 Jun 2014 19:39:07 +0100
Subject: Apply filters again whenever experience picker floater is shown for
 ACME-1505

---
 indra/newview/llfloaterexperiencepicker.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp
index 04a2d541de..bb54c57baf 100644
--- a/indra/newview/llfloaterexperiencepicker.cpp
+++ b/indra/newview/llfloaterexperiencepicker.cpp
@@ -59,7 +59,9 @@ LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t ca
 		floater->mSearchPanel->mSelectionCallback = callback;
 		floater->mSearchPanel->mCloseOnSelect = close_on_select;
 		floater->mSearchPanel->setAllowMultiple(allow_multiple);
+		floater->mSearchPanel->setDefaultFilters();
 		floater->mSearchPanel->addFilters(filters.begin(), filters.end());
+		floater->mSearchPanel->filterContent();
 	}
 
 	if(frustumOrigin)
-- 
cgit v1.2.3


From 53a39f360979ee7615d4c4bc069754d8b71bb600 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 11 Jun 2014 01:58:47 +0100
Subject: Added question mark help button to the experiences floater for
 ACME-1506

---
 indra/newview/skins/default/xui/en/floater_experiences.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index fe959ea6d8..70e7507907 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -8,6 +8,7 @@
   min_height="300"
   min_width="500"
   layout="topleft"
+  help_topic="floater_experiences"
   name="floater_experiences"
   save_rect="true"
   single_instance="true"
-- 
cgit v1.2.3


From d04d37e200466fd50cd7d0e9a32b2f60df924960 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 11 Jun 2014 23:25:18 +0100
Subject: Added help topic to experience profile floater for ACME-1506

---
 indra/newview/skins/default/xui/en/floater_experienceprofile.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index c6a749b45f..165de9592e 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -5,6 +5,7 @@
   can_close="true"
   enabled="true"
   can_resize="true"
+  help_topic="floater_experienceprofile"
   title="EXPERIENCE PROFILE"
   save_rect="true"
   min_width="325"
-- 
cgit v1.2.3


From 7019c39a97ffc10090d52a8545521e78d6583a0a Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 11 Jun 2014 23:33:19 +0100
Subject: Moved buttons to very bottom of edit experience profile floater for
 ACME-1503

---
 .../default/xui/en/floater_experienceprofile.xml   | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 165de9592e..d146d1306f 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -649,6 +649,17 @@
                      follows="top|left|right"
                      label="Hide In Search"
                      name="edit_private_btn"/>
+          <text
+            follows="left|top|right"
+            height="25"
+            layout="topleft"
+            left="10"
+            top_pad="10"
+            name="changes"
+            use_ellipses="true"
+            word_wrap="true"
+            value="Experience changes may take several minutes to be seen on all regions."
+            right="-10"/>
           <button
             follows="top|left"
             height="23"
@@ -669,17 +680,6 @@
             width="125"
             right="-10"
             visible="true"/>
-          <text
-            follows="left|top|right"
-            height="25"
-            layout="topleft"
-            left="10"
-            top_pad="10"
-            name="changes"
-            use_ellipses="true"
-            word_wrap="true"
-            value="Experience changes may take several minutes to be seen on all regions."
-            right="-10"/>
         </panel>
       </scroll_container>
     </panel>
-- 
cgit v1.2.3