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/floater_preview_trash.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/floater_preview_trash.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_preview_trash.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml index 54cf632727..afb68e5944 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_trash.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_trash.xml @@ -1,7 +1,12 @@ -<?xml version="1.0" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_preview_trash" title="ゴミ箱"> - <layout_panel name="empty_btn_lp"/> + <inventory_panel name="inventory_trash"/> <layout_stack name="button_panel_ls"> - <button name="empty_btn" label="ゴミ箱を空にする"/> + <layout_panel name="empty_btn_lp"> + <button label="ゴミ箱を空に" name="empty_btn"/> + </layout_panel> + <layout_panel name="share_btn_lp"> + <button label="キャンセル" name="cancel_btn"/> + </layout_panel> </layout_stack> </floater> |