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/ja/panel_edit_physics.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/ja/panel_edit_physics.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_edit_physics.xml | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml index 6ebf0062dc..54ad79568f 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml @@ -2,13 +2,27 @@ <panel name="edit_physics_panel"> <panel label="" name="accordion_panel"> <accordion name="physics_accordion"> - <accordion_tab name="physics_breasts_updown_tab" title="胸の弾み"/> - <accordion_tab name="physics_breasts_inout_tab" title="胸の谷間"/> - <accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ"/> - <accordion_tab name="physics_belly_tab" title="お腹の弾み"/> - <accordion_tab name="physics_butt_tab" title="お尻の弾み"/> - <accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ"/> - <accordion_tab name="physics_advanced_tab" title="高度なパラメーター"/> + <accordion_tab name="physics_breasts_updown_tab" title="胸の弾み"> + <scrolling_panel_list name="physics_breasts_updown_param_list"/> + </accordion_tab> + <accordion_tab name="physics_breasts_inout_tab" title="胸の谷間"> + <scrolling_panel_list name="physics_breasts_inout_param_list"/> + </accordion_tab> + <accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ"> + <scrolling_panel_list name="physics_breasts_leftright_param_list"/> + </accordion_tab> + <accordion_tab name="physics_belly_tab" title="お腹の弾み"> + <scrolling_panel_list name="physics_belly_updown_param_list"/> + </accordion_tab> + <accordion_tab name="physics_butt_tab" title="お尻の弾み"> + <scrolling_panel_list name="physics_butt_updown_param_list"/> + </accordion_tab> + <accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ"> + <scrolling_panel_list name="physics_butt_leftright_param_list"/> + </accordion_tab> + <accordion_tab name="physics_advanced_tab" title="高度なパラメーター"> + <scrolling_panel_list name="physics_advanced_param_list"/> + </accordion_tab> </accordion> </panel> </panel> |