diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-22 15:12:27 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-22 15:12:27 -0700 |
| commit | 9d3a5fef8fc0ec64f018ff6d4f0fca88fd9c33db (patch) | |
| tree | 0a0233b65685c694675a24c8872ed1dceda27543 /indra/newview | |
| parent | 28f311b7ffc807f712dc9bd853267eac85794b78 (diff) | |
MAINT-9034, MAINT-9035: Move the load frame button and change the lock icon to text.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 48 |
1 files changed, 19 insertions, 29 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 dd0048e8f8..e553948d9d 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 @@ -401,9 +401,17 @@ width="90" label="Add Frame" left_pad="175" - top_delta="-12" + top_delta="-20" name="add_frame" /> <button + follows="top|left" + height="23" + width="90" + label="Load Frame" + top_pad="0" + left_delta="0" + name="btn_load_frame" /> + <button follows="left|top" height="23" width="90" @@ -422,36 +430,18 @@ visible="true"> <!--bg_alpha_color="blue" background_visible="true" --> - <icon - border="1" - bevel_style="out" + <text name="icn_lock_edit" - layout="bottomleft" follows="bottom" - image_name="Locked_Icon" - bottom="4" - left="5" - height="15" - width="15" - tab_stop="false" - visible="false" - tool_tip="Select a key frame above to edit settings"/> - <button - name="btn_load_frame" - follows="top" - image_overlay="Command_Inventory_Icon" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - auto_resize="false" - layout="topleft" - height="30" - width="30" - left="25" - top="1" - tool_tip="Replace frame with settings from inventory"/> + height="10" + layout="bottomleft" + left_delta="15" + top_pad="15" + font="SansSerif" + text_color="Yellow" + width="500"> +Select a key frame from the timeline above to edit settings. + </text> </layout_panel> <layout_panel name="frame_settings_water" auto_resize="true" |