diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:22:43 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-13 18:22:43 +0200 |
commit | 0bba892bb0b146a2c20597d8cfe6eb0353c17f06 (patch) | |
tree | 15d3ad979533feb32114589a5fd4f79e4aa8a5ae /indra/newview/skins/default/xui/zh/menu_wearing_tab.xml | |
parent | dfc406f0ff4e03e36c3d877c9bd57d2c18e08d43 (diff) | |
parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) |
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/zh/menu_wearing_tab.xml')
-rw-r--r-- | indra/newview/skins/default/xui/zh/menu_wearing_tab.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml index dc9adcbd25..945297885e 100644 --- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml +++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Wearing"> + <menu_item_call label="觸碰" name="touch_attach"/> <menu_item_call label="脫下" name="take_off"/> <menu_item_call label="卸下" name="detach"/> - <menu_item_call label="編輯裝扮" name="edit"/> + <menu_item_call label="編輯裝扮" name="edit_outfit"/> <menu_item_call label="編輯" name="edit_item"/> <menu_item_call label="顯示原件" name="show_original"/> </context_menu> |