diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
commit | a08c362d88487a390de340d75c3394c8800546be (patch) | |
tree | 1d4a25d8df0a07b85f135cb6359b4d6c8f37fe76 /indra/newview/skins/default/xui/en/floater_day_cycle_options.xml | |
parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
parent | 0c7f003bfc3bb9f74b0194ce18861514efe77066 (diff) |
merge up latest viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_day_cycle_options.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_day_cycle_options.xml | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 65e2462ef8..b54dc87d24 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -362,7 +362,7 @@ label_width="35" layout="topleft" left_delta="20" - max_val="100" + max_val="23" name="WLCurKeyHour" top_pad="4" width="74" /> @@ -420,31 +420,8 @@ height="16" layout="topleft" left_pad="15" - name="DayCycleText" - top="114" - width="120"> - Snap: - </text> - <combo_box - enabled="false" - height="18" - label="5 min" - layout="topleft" - left_delta="0" - name="WLSnapOptions" - top_pad="7" - width="70" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" name="DayCycleText2" - top_pad="17" + top_delta="71" width="120"> Length of Cycle: </text> |