summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:06:53 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:06:53 +0200
commitd3d2a8d537bf1542c152afdb239f7021ebdbe78f (patch)
tree602b749a5e2c13384b27a69a845b782449f96748 /indra/newview/skins/default/xui/ja/panel_bottomtray.xml
parentb68ccadd46d2ff094147ffd72318fd3a728c28eb (diff)
parent86cab299b01081c8c89587fd72d81460318e4ec1 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/ja/panel_bottomtray.xml')
-rw-r--r--indra/newview/skins/default/xui/ja/panel_bottomtray.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
index 5edc1b651d..414413a980 100644
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
@@ -8,7 +8,7 @@
</string>
<layout_stack name="toolbar_stack">
<layout_panel name="gesture_panel">
- <gesture_combo_box label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
+ <gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
</layout_panel>
<layout_panel name="movement_panel">
<button label="移動" name="movement_btn" tool_tip="移動コントロールの表示・非表示"/>
@@ -19,5 +19,15 @@
<layout_panel name="snapshot_panel">
<button label="" name="snapshots" tool_tip="スナップショットを撮る"/>
</layout_panel>
+ <layout_panel name="im_well_panel">
+ <chiclet_im_well name="im_well">
+ <button name="Unread IM messages" tool_tip="Conversations"/>
+ </chiclet_im_well>
+ </layout_panel>
+ <layout_panel name="notification_well_panel">
+ <chiclet_notification name="notification_well">
+ <button name="Unread" tool_tip="通知"/>
+ </chiclet_notification>
+ </layout_panel>
</layout_stack>
</panel>