diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:08:35 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:08:35 -0700 |
| commit | 656967b326c59a3966261cd75e256e3a7a27cc0a (patch) | |
| tree | 1c2c4c8f2adae7f17930843913a286fc1fd784b4 /indra/newview/skins/default/xui/en | |
| parent | 044b80e4e1a7b55f46e6f3b52c9cae6d9c6df3eb (diff) | |
| parent | b6ba9dd565b59e516571445e56f9dafe3bdf4061 (diff) | |
Merge PR
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index 3a3779e753..ba4e15e7db 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -470,6 +470,22 @@ top_pad="0" name="save_btn" width="100" /> + + <button + follows="top|left" + height="23" + name="btn_flyout" + label="" + layout="topleft" + left_pad="-20" + top="0" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + <button follows="top|left" height="23" @@ -479,29 +495,14 @@ name="cancel_btn" width="100" /> - <button + <!--<button follows="top|left" height="23" label="Upload" layout="topleft" left_pad="10" name="upload_btn" - width="100" /> - - <!--<button - follows="top|left" - height="23" - name="btn_flyout" - label="" - layout="topleft" - left_pad="-20" - top="0" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/>--> + width="100" />--> </layout_panel> </layout_stack> |