diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:16:09 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:16:09 +0300 |
commit | 5c18921e9ada7799e31b30e16aabc0580e5d5d38 (patch) | |
tree | 28d8f9c2bed0909c897be5318b31a91a23c835b4 /indra/newview/skins/default/xui/ru/panel_profile_pick.xml | |
parent | 1f930a7222b66ebf254ccf8cbda965514915fc3f (diff) | |
parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/ru/panel_profile_pick.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ru/panel_profile_pick.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_pick.xml b/indra/newview/skins/default/xui/ru/panel_profile_pick.xml new file mode 100644 index 0000000000..a2ff5710ea --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_profile_pick.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_pick_info"> + <panel.string name="location_notice"> + (будет обновлено после сохранения) + </panel.string> + <line_editor name="pick_location"> + Загрузка... + </line_editor> + <button label="Телепорт" name="teleport_btn"/> + <button label="Показать на карте" name="show_on_map_btn"/> + <button label="Указать местоположение" name="set_to_curr_location_btn" tool_tip="Установить в текущее местоположение"/> + <button label="Сохранить подборку" name="save_changes_btn"/> +</panel> |