diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:47:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:47:01 -0500 |
| commit | a0d3c7c0f8a5693a0ce3471142b8229578e9e948 (patch) | |
| tree | c43e7f9b083079d3be6252a7c56c4618e6561273 /indra/newview/skins/default/xui/en | |
| parent | 31d401e1c3ccedfc06b9efda51923d050029cfc9 (diff) | |
| parent | 7c0c86774f601cab3e0ca1598ea786b803c5bc71 (diff) | |
merge fix for storm-401
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_windlight_options.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 85a5be369c..249ad95c41 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -594,6 +594,7 @@ left_delta="14" top_pad="10" name="SkyDayCycle" + use_draw_context_alpha="false" width="148" /> <slider control_name="WLSunAngle" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 7caf425058..61e3bb354f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -59,7 +59,7 @@ left="0" name="profile_scroll" opaque="true" - height="527" + height="400" width="317" top="0"> <panel |