diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-06 15:31:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-06 15:31:36 -0400 |
| commit | 66dcc72870b19c6ada65a643ca33c779c9c9989b (patch) | |
| tree | 2de9e0f4aa1d8a8654610546245e9c1aa6048188 /indra | |
| parent | d0f244ac29f2588b922cc4f44afb91d5b6982ce1 (diff) | |
| parent | 3d3ec0a29486b3d8fe9d6995d280d43f86e57f26 (diff) | |
merge changes for storm-1479
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index 7aae966879..d9a3ad0c4b 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -67,7 +67,7 @@ height="10" layout="topleft" left="10" - name="water_color_label" + name="hint_item1" top="100" width="300"> - Click on a tab to edit the specific sky settings and time. @@ -76,7 +76,7 @@ follows="left|top|right" height="10" layout="topleft" - name="water_color_label" + name="hint_item2" top_pad="10" width="300"> - Click and drag the tabs to set the transition times. @@ -85,7 +85,7 @@ follows="left|top|right" height="10" layout="topleft" - name="water_color_label" + name="hint_item3" top_pad="10" width="300"> - Use the scrubber to preview your day cycle. @@ -402,7 +402,7 @@ height="16" layout="topleft" left_delta="192" - name="WLCurKeyTimeText2" + name="WLCurKeyPresetText" top_pad="10" width="80"> Sky Setting: @@ -423,7 +423,7 @@ height="16" layout="topleft" left_delta="-40" - name="WLCurKeyTimeText2" + name="WLCurKeyTimeText" top_pad="15" width="35"> Time: |