diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-10-09 21:36:25 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-10-09 21:36:25 +0300 |
| commit | 83b508a656aebedff915b2fdcd292432a8aaa7b2 (patch) | |
| tree | 58d99767f7e558c9e2ebb7db7958cfa4a77606c9 /indra/newview/skins/default | |
| parent | 6bb496625f4492fabd44bd0e86acb8b599df8c43 (diff) | |
Backed out SL-9733 - more work needs to be done
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_my_environments.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_settings_picker.xml | 5 |
2 files changed, 4 insertions, 6 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 4384c01033..a11a2c1200 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -102,7 +102,7 @@ background_visible="true" bg_alpha_color="DkGray2" border="true"> - <asset_filtered_inv_panel + <inventory_panel left="0" top="0" right="-1" @@ -110,8 +110,7 @@ allow_multi_select="false" follows="all" layout="topleft" - name="pnl_settings" - filter_asset_type="settings"/> + name="pnl_settings"/> </panel> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml index 7cc2c517ca..2862d1ae37 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -57,7 +57,7 @@ bottom="-2" background_visible="true" bg_alpha_color="DkGray2"> - <asset_filtered_inv_panel + <inventory_panel allow_multi_select="false" suppress_folder_menu="true" bg_visible="true" @@ -68,8 +68,7 @@ name="pnl_inventory" top="1" right="-4" - bottom="-1" - filter_asset_type="settings" /> + bottom="-1" /> </panel> </layout_panel> <layout_panel name="temp" |