summaryrefslogtreecommitdiff
path: root/indra/newview/skins/minimal/xui/ja
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-21 09:30:22 -0400
committerOz Linden <oz@lindenlab.com>2011-07-21 09:30:22 -0400
commitdcc57bbb0e684e548cda625a87738aa241ff37b0 (patch)
treeca6c8ff6f7ad0e366560d1c1604e1345b63dcf62 /indra/newview/skins/minimal/xui/ja
parent91bc7e34cf7abcbd6f5d3c5ac4af002d0fe4e3ec (diff)
parentcec8d8b3e649d6cf946e427730793260f2c6296f (diff)
merge changes for eli2_viewer-development
Diffstat (limited to 'indra/newview/skins/minimal/xui/ja')
-rw-r--r--indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml17
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml
index f2429ac12a..14c38c796f 100644
--- a/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <text name="avatar_name" value="不明"/>
<layout_stack name="button_stack">
<layout_panel name="view_profile_btn_panel">
<button label="プロフィール" name="view_profile_btn"/>
@@ -11,20 +10,20 @@
<layout_panel name="teleport_btn_panel">
<button label="テレポート" name="teleport_btn" tool_tip="この人にテレポートを送ります"/>
</layout_panel>
- <layout_panel name="share_btn_panel">
- <button label="共有" name="share_btn"/>
- </layout_panel>
- <layout_panel name="pay_btn_panel">
- <button label="支払う" name="pay_btn"/>
- </layout_panel>
<layout_panel name="call_btn_panel">
<button label="コール" name="call_btn"/>
</layout_panel>
<layout_panel name="end_call_btn_panel">
<button label="コール終了" name="end_call_btn"/>
</layout_panel>
- <layout_panel name="voice_ctrls_btn_panel">
- <button label="ボイスコントロール" name="voice_ctrls_btn"/>
+ <layout_panel name="block_btn_panel">
+ <button label="ブロック" name="block_btn"/>
+ </layout_panel>
+ <layout_panel name="unblock_btn_panel">
+ <button label="ブロック解除" name="unblock_btn"/>
+ </layout_panel>
+ <layout_panel name="volume_ctrl_panel">
+ <slider name="volume_slider" tool_tip="コールの音量" value="0.5"/>
</layout_panel>
</layout_stack>
</panel>