diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:07:50 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:07:50 -0800 |
commit | d4f790f72866b43956ce4216bf6471c85f4afc6c (patch) | |
tree | 6b0906e09303a2efc999c636ec086718baf762ba /indra/newview/skins | |
parent | 113c7edf60b65a68510f75fdda69ba5b22dc23f0 (diff) |
FIX: zoom/unzoom should appear to be one icon
this was a fairly trivial UI change....
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index fc5ccdb63e..3bdd7114ee 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -494,13 +494,32 @@ disabled image_selected="media_btn_optimalzoom.png" image_unselected="media_btn_optimalzoom.png" layout="topleft" - tool_tip="Zoom" + tool_tip="Zoom into media" min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Zoom" /> </button> </layout_panel> + <layout_panel + name="close" + auto_resize="false" + user_resize="false" + layout="topleft" + min_width="21" + width="21" > + <button + height="22" + image_selected="media_btn_done.png" + image_unselected="media_btn_done.png" + layout="topleft" + tool_tip ="Zoom Back" + top_delta="-4" + width="21" > + <button.commit_callback + function="MediaCtrl.Close" /> + </button> + </layout_panel> <!-- <panel height="22" @@ -554,25 +573,6 @@ disabled </panel> --> <layout_panel - name="close" - auto_resize="false" - user_resize="false" - layout="topleft" - min_width="21" - width="21" > - <button - height="22" - image_selected="media_btn_done.png" - image_unselected="media_btn_done.png" - layout="topleft" - tool_tip ="Close media control" - top_delta="-4" - width="21" > - <button.commit_callback - function="MediaCtrl.Close" /> - </button> - </layout_panel> - <layout_panel width="0" layout="topleft" user_resize="false" /> |