diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-04-18 17:35:28 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-04-18 17:35:28 +0300 |
| commit | 32598518816be6c312acc9b027d3a28ed807429a (patch) | |
| tree | 1be9e5045047daf6d1ef43113669dd4e7bbd7321 /indra/newview/skins/default/xui/en | |
| parent | 83e0af9f95c39b1385cd63df46874b040a408af6 (diff) | |
SL-10983 [EEP] Add a search box to the "My Environments" floater
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_my_environments.xml | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 854ac8b758..7e65e5d69c 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -28,9 +28,8 @@ border="true" bevel_style="in" auto_resize="false" - user_resize="true" tab_group="1" - height="24" + height="54" name="filter_panel" label="Filters" font="SansSerifBold"> @@ -82,6 +81,15 @@ name="chk_water" top_delta="0" width="60" /> + <filter_editor + follows="left|top|right" + height="23" + label="Filter Environments" + layout="topleft" + left="4" + name="flt_search" + top_pad="6" + right="-4" /> </layout_panel> <layout_panel auto_resize="true" @@ -116,7 +124,6 @@ </layout_panel> <layout_panel auto_resize="false" - user_resize="true" tab_group="1" height="31" name="pnl_control" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fa5b6062df..fc3556ddc0 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11410,8 +11410,8 @@ Are you sure you want to continue? icon="alertmodal.tga" name="PersonalSettingsConfirmReset" type="alertmodal"> - You are about to remove all applied Personal lighting settings. - Are you sure you want to continue? +You are about to remove all applied Personal lighting settings. +Are you sure you want to continue? <tag>confirm</tag> <usetemplate name="okcancelbuttons" |