diff options
| author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-11-24 15:55:29 -0500 |
|---|---|---|
| committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-11-24 15:55:29 -0500 |
| commit | 6f95a90b222ffc369696ae59b7b77e778c471713 (patch) | |
| tree | a8adc90c9d1a640e0cef8b6c4ca11d58250587c3 /indra | |
| parent | cb48c896d63f9b84d69fe6ca451ce06b34bd079c (diff) | |
| parent | 7f4e9e2cdcf45a2763aad361ecc4e5d30666058a (diff) | |
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_animation_preview.xml | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 41b1f99d41..bb45e51137 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -452,28 +452,38 @@ Maximum animation length is [MAX_LENGTH] seconds. width="200" /> <button follows="top|right" - height="28" - image_selected="button_anim_play_selected.tga" - image_unselected="button_anim_play.tga" + height="23" + image_overlay="Play_Over" + image_unselected="SegmentedBtn_Left_Off" + image_selected="SegmentedBtn_Left_On_Selected" + image_disabled_selected="SegmentedBtn_Left_Selected_Disabled" + image_disabled="SegmentedBtn_Left_Disabled" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Selected_Press" layout="topleft" left="10" name="play_btn" tool_tip="Play/pause your animation" top_pad="0" - width="28" /> + width="23" /> <button follows="top|right" - height="28" - image_selected="button_anim_stop_selected.tga" - image_unselected="button_anim_stop.tga" + height="23" + image_overlay="StopReload_Over" + image_unselected="SegmentedBtn_Right_Off" + image_selected="SegmentedBtn_Right_On_Selected" + image_disabled_selected="SegmentedBtn_Right_Selected_Disabled" + image_disabled="SegmentedBtn_Right_Disabled" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" layout="topleft" - left_pad="4" name="stop_btn" tool_tip="Stop animation playback" top_delta="0" - width="28" /> + left_delta="23" + width="23" /> <slider - left_pad="0" + left_pad="10" follows="top|right" height="23" width="200" |