diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml deleted file mode 100644 index 957609a7a3..0000000000 --- a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<toggleable_menu name="Gear Menu"> - <menu_item_call label="Смотреть профиль" name="view_profile"/> - <menu_item_call label="В друзья" name="add_friend"/> - <menu_item_call label="IM" name="im"/> - <menu_item_call label="Звонок" name="call"/> - <menu_item_call label="Телепорт" name="teleport"/> - <menu_item_call label="Пригласить в группу" name="invite_to_group"/> - <menu_item_call label="Заблокировать" name="block"/> - <menu_item_call label="Разблокировать" name="unblock"/> - <menu_item_call label="Пожаловаться" name="report"/> - <menu_item_call label="Заморозить" name="freeze"/> - <menu_item_call label="Выкинуть" name="eject"/> - <menu_item_call label="Выкинуть" name="kick"/> - <menu_item_call label="Поддержка" name="csr"/> - <menu_item_call label="Отладка текстур" name="debug"/> - <menu_item_call label="Найти на карте" name="find_on_map"/> - <menu_item_call label="Приблизить" name="zoom_in"/> - <menu_item_call label="Заплатить" name="pay"/> - <menu_item_call label="Поделиться" name="share"/> -</toggleable_menu> |