diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:23:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:23:47 -0400 |
| commit | 853231580aa2a6bf2894c20495c549a9d5f3c673 (patch) | |
| tree | 8f83d76437b4f450c7b9ce0db0c67caff3dc210c /indra/newview/skins/default/xui | |
| parent | 6bdfc3d0482b3bbfb55abdb71220ea19391fbe14 (diff) | |
| parent | fc71ae3e69e78a2e34832418c6c120c9e633bbb6 (diff) | |
merge latest updates from Vadim
Diffstat (limited to 'indra/newview/skins/default/xui')
| -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> |