diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:52:42 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:52:42 +0000 |
| commit | c1d1935fcce68874511f85a079cfcc1a5af28fa8 (patch) | |
| tree | 8f9c422dc7e614f6e2b837373957cb9f05eae8b8 /indra/newview/skins | |
| parent | 6f54ebe1c1e6be356740a27eb4035e8c65889d56 (diff) | |
| parent | 13126a27f1acc482f3f05e2c4f2a41df8b3bc69a (diff) | |
Merged in andreykproductengine/maint-eep (pull request #135)
SL-9733 Perfomance trweak.
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/skins')
| -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, 6 insertions, 4 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 a11a2c1200..4384c01033 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"> - <inventory_panel + <asset_filtered_inv_panel left="0" top="0" right="-1" @@ -110,7 +110,8 @@ allow_multi_select="false" follows="all" layout="topleft" - name="pnl_settings"/> + name="pnl_settings" + filter_asset_type="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 2862d1ae37..7cc2c517ca 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"> - <inventory_panel + <asset_filtered_inv_panel allow_multi_select="false" suppress_folder_menu="true" bg_visible="true" @@ -68,7 +68,8 @@ name="pnl_inventory" top="1" right="-4" - bottom="-1" /> + bottom="-1" + filter_asset_type="settings" /> </panel> </layout_panel> <layout_panel name="temp" |