diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
| commit | d3a606f8323a32c660c71675257e3abd95cb097e (patch) | |
| tree | 11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/skins/default/xui/it/panel_bottomtray.xml | |
| parent | 5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff) | |
| parent | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff) | |
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_bottomtray.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_bottomtray.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray.xml b/indra/newview/skins/default/xui/it/panel_bottomtray.xml index f2aab63dce..ccefc91ce1 100644 --- a/indra/newview/skins/default/xui/it/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/it/panel_bottomtray.xml @@ -7,8 +7,13 @@ Mostra/nascondi il pannello voice control </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Parla" label_selected="Parla" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> - <gesture_combo_box label="Gesture" name="Gesture" tool_tip="Mostra/nascondi gestures"/> + <gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra/nascondi gestures"/> </layout_panel> <layout_panel name="movement_panel"> <button label="Sposta" name="movement_btn" tool_tip="Mostra/nascondi i controlli del movimento"/> @@ -19,5 +24,15 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Scatta una foto"/> </layout_panel> + <layout_panel name="im_well_panel"> + <chiclet_im_well name="im_well"> + <button name="Unread IM messages" tool_tip="Conversazioni"/> + </chiclet_im_well> + </layout_panel> + <layout_panel name="notification_well_panel"> + <chiclet_notification name="notification_well"> + <button name="Unread" tool_tip="Notifiche"/> + </chiclet_notification> + </layout_panel> </layout_stack> </panel> |