diff options
Diffstat (limited to 'indra')
3 files changed, 15 insertions, 11 deletions
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) diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml index c6a749b45f..d146d1306f 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" @@ -648,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" @@ -668,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> 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" |