diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
commit | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch) | |
tree | 47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/newview/skins/default/xui/en/sidepanel_inventory.xml | |
parent | f480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff) | |
parent | 8dd62863092b10e012db20e818e72b53fd2ed84a (diff) |
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/sidepanel_inventory.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index a233d42568..812d94c55f 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -46,17 +46,27 @@ left="0" name="info_btn" top="0" - width="153" /> + width="102" /> + <button + enabled="true" + follows="bottom|left" + height="23" + label="Share" + layout="topleft" + left="105" + name="share_btn" + top="0" + width="102" /> <button enabled="false" follows="bottom|left" height="23" label="Wear" layout="topleft" - left="156" + left="210" name="wear_btn" top="0" - width="152" /> + width="102" /> <button enabled="false" follows="bottom|left" @@ -64,19 +74,19 @@ label="Play" layout="topleft" name="play_btn" - left="156" + left="210" top="0" - width="152" /> + width="102" /> <button enabled="false" follows="bottom|left" height="23" label="Teleport" layout="topleft" - left="156" + left="210" name="teleport_btn" top="0" - width="152" /> + width="102" /> </panel> </panel> |