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/zh/panel_profile_interests.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/zh/panel_profile_interests.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/zh/panel_profile_interests.xml | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml b/indra/newview/skins/default/xui/zh/panel_profile_interests.xml deleted file mode 100644 index 150f3cca4f..0000000000 --- a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="興趣" name="panel_profile_interests"> - <text name="I Want To:"> - 我想要： - </text> - <check_box label="建造" name="chk0"/> - <check_box label="探索" name="chk1"/> - <check_box label="見面" name="chk2"/> - <check_box label="受雇" name="chk6"/> - <check_box label="群組" name="chk3"/> - <check_box label="購買" name="chk4"/> - <check_box label="出售" name="chk5"/> - <check_box label="招人" name="chk7"/> - <line_editor name="want_to_edit"> - （載入中...） - </line_editor> - <text name="Skills:"> - 技能： - </text> - <check_box label="材質" name="schk0"/> - <check_box label="架構" name="schk1"/> - <check_box label="建模" name="schk3"/> - <check_box label="計畫活動" name="schk2"/> - <check_box label="建腳本" name="schk4"/> - <check_box label="定製角色" name="schk5"/> - <line_editor name="skills_edit"> - （載入中...） - </line_editor> - <text name="Languages:"> - 語言： - </text> - <line_editor name="languages_edit"> - （載入中...） - </line_editor> -</panel> |