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_profile_texture.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_profile_texture.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/floater_profile_texture.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_profile_texture.xml b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml new file mode 100644 index 0000000000..d4b5efa2c7 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_profile_texture.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="profile_texture"> + <layout_stack name="preview_stack"> + <layout_panel name="texture_panel"> + <icon name="profile_pic"/> + </layout_panel> + <layout_panel name="buttons_panel"> + <layout_stack name="buttons_stack"> + <layout_panel name="resizer_left"/> + <layout_panel name="close_panel"> + <button label="閉じる" name="close_btn"/> + </layout_panel> + <layout_panel name="resizer_right"/> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> |