diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-23 17:21:10 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-23 17:21:10 -0500 |
commit | 8eb62aef06bc670ed758c605e6308ff700978a33 (patch) | |
tree | 0e90b772b83c550208d263dff2b78d7385182ba0 /indra/newview/skins/default/xui/en/panel_im_control_panel.xml | |
parent | fc1860bcc6bab4b538692662db2da4be1def5af4 (diff) | |
parent | c36973dbc8694c418993d567505ec115456d218e (diff) |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_im_control_panel.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 73d843e6dd..0a5812882d 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -38,12 +38,12 @@ label="Teleport" name="teleport_btn" width="100" /> - <!-- <button + <button follows="left|top" height="20" label="Share" name="share_btn" - width="100" />--> + width="100" /> <!--Removing pay button to save space - will update spec - verified by Erica/Steve --> <!-- <button follows="left|top" |