diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
| commit | 4b98ae6e8a4c54fa70246beb5d7ff28a5590e819 (patch) | |
| tree | 11e49d0cb85d8420ac614f039b32e5ec16202de3 /indra/newview/skins/default/xui/ru | |
| parent | 0db9bcf21fd4b7172e8a35cdb2805ccdc736e273 (diff) | |
| parent | 07ace73c49918ffb70e99c2239849eaaabc1fe45 (diff) | |
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
# indra/newview/llspatialpartition.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/ru')
| -rw-r--r-- | indra/newview/skins/default/xui/ru/panel_main_inventory.xml | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml index b473fb8f98..a0ff3a9f67 100644 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml @@ -13,27 +13,24 @@ <text name="ItemcountText"> Вещи: </text> - <filter_editor label="Введите текст поиска" name="inventory search editor"/> - <combo_box name="search_type"> - <item label="Название" name="Name" value="search_by_name"/> - <item label="Создатель" name="Creator" value="search_by_creator"/> - <item label="Описание" name="Description" value="search_by_description"/> - <item label="УУИд" name="UUID" value="search_by_UUID"/> - </combo_box> - <tab_container name="inventory filter tabs"> - <inventory_panel label="МОЙ ИНВЕНТАРЬ" name="All Items"/> - <recent_inventory_panel label="НЕДАВНИЕ" name="Recent Items"/> - <inventory_panel label="НОСИМОЕ" name="Worn Items"/> - </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <menu_button name="options_gear_btn" tool_tip="Показать дополнительные параметры"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Добавить новую вещь"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Удалить выбранную вещь"/> - </layout_panel> - </layout_stack> + <layout_stack name="top_stack"> + <layout_panel name="filter_layout_panel"> + <combo_box name="search_type"> + <item label="Название" name="Name" value="search_by_name"/> + <item label="Создатель" name="Creator" value="search_by_creator"/> + <item label="Описание" name="Description" value="search_by_description"/> + <item label="УУИд" name="UUID" value="search_by_UUID"/> + </combo_box> + <filter_editor label="Введите текст поиска" name="inventory search editor"/> + <menu_button name="options_gear_btn" tool_tip="Показать дополнительные параметры"/> + <button name="add_btn" tool_tip="Добавить новую вещь"/> + </layout_panel> + </layout_stack> + <panel name="default_inventory_panel"> + <tab_container name="inventory filter tabs"> + <inventory_panel label="МОЙ ИНВЕНТАРЬ" name="All Items"/> + <recent_inventory_panel label="НЕДАВНИЕ" name="Recent Items"/> + <inventory_panel label="НОСИМОЕ" name="Worn Items"/> + </tab_container> + </panel> </panel> |