diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-07 10:25:39 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-07 10:25:39 -0800 |
| commit | dd030f1b750c230d02515027d69ba79f0084a221 (patch) | |
| tree | 68b5f5ebe16a0c5d77fa50dc82f68574ca452e53 /indra/newview/skins | |
| parent | 8dbb91728fba85f545dce39096399f505dabb960 (diff) | |
| parent | 6122f000cb249dd2f8cbc0d16e664bb1b00d5864 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 152c897120..9f6503d799 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -32,7 +32,7 @@ top="0" width="450"> <layout_panel - auto_resize="true" + auto_resize="false" user_resize="true" height="430" name="conversations_layout_panel" @@ -73,13 +73,26 @@ image_hover_unselected="Toolbar_Middle_Over" image_overlay="Conv_toolbar_plus" image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" + image_unselected="Toolbar_Middle_Off" layout="topleft" top="5" left_pad="4" name="add_btn" tool_tip="Start a new conversation" width="31"/> + <button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Command_Speak_Icon" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="4" + name="speak_btn" + tool_tip="Speak with people using your microphone" + width="31"/> </layout_panel> <layout_panel auto_resize="false" |