diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-04-22 16:02:53 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-04-22 16:02:53 +0300 |
| commit | ce9cf1027f733560e29f77c4a883bd9b5338f9d8 (patch) | |
| tree | 3164e2821a7359698c994972f895913cb7c99fd7 /indra/newview/skins | |
| parent | 11d1c28d82e8c2e53a4d161eefac4c1733467fd3 (diff) | |
SL-10982 [EEP] Personal Lighting - Add options to select water maps / cloud textures
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_adjust_environment.xml | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml index fc356c10c7..59589e3665 100644 --- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml +++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml @@ -5,14 +5,14 @@ save_rect="false" title="Personal Lighting" width="845" - height="230" + height="240" min_width="500" - min_height="225" + min_height="235" single_instance="true" can_resize="false"> <layout_stack name="outer_stack" width="845" - height="220" + height="230" follows="all" animate="false" top="0" @@ -47,7 +47,7 @@ width="80">Ambient:</text> <color_swatch can_apply_immediately="true" follows="left|top" - height="37" + height="40" label_height="0" layout="topleft" left_delta="0" @@ -62,7 +62,7 @@ width="80">Blue Horizon:</text> <color_swatch can_apply_immediately="true" follows="left|top" - height="37" + height="40" label_height="0" layout="topleft" left_delta="0" @@ -77,7 +77,7 @@ width="80">Blue Density:</text> <color_swatch can_apply_immediately="true" follows="left|top" - height="37" + height="40" label_height="0" layout="topleft" left_delta="0" @@ -97,12 +97,12 @@ <text follows="right|top" height="10" layout="topleft" - right="-10" + right="-12" top="5" width="60">Sun Color:</text> <color_swatch can_apply_immediately="true" follows="left|top" - height="37" + height="10" label_height="0" layout="topleft" left_delta="0" @@ -113,17 +113,43 @@ height="10" layout="topleft" left_delta="0" - top_pad="10" + top_pad="5" width="80">Cloud Color:</text> <color_swatch can_apply_immediately="true" follows="left|top" - height="37" + height="10" label_height="0" layout="topleft" left_delta="0" name="cloud_color" top_pad="5" width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="10" + name="cloud_map_label" + width="80">Cloud Image:</text> + <texture_picker height="63" + layout="topleft" + left_delta="0" + name="cloud_map" + top_pad="5" + width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="-13" + name="cloud_map_label" + width="80">Water Image:</text> + <texture_picker height="63" + layout="topleft" + left_delta="0" + name="water_normal_map" + top_pad="5" + width="60"/> </layout_panel> <layout_panel border="false" bevel_style="in" @@ -257,7 +283,7 @@ layout="topleft" name="sunbeacon" left_delta="55" - bottom="-10" + bottom="-20" follows="bottom|right"/> <text follows="left|top" height="10" @@ -366,7 +392,7 @@ layout="topleft" name="moonbeacon" right="-50" - bottom="-10" + bottom="-20" follows="bottom|right"/> </layout_panel> </layout_stack> |