diff options
author | Paul ProductEngine <pguslisty@productengine.com> | 2011-04-29 17:59:50 +0300 |
---|---|---|
committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-04-29 17:59:50 +0300 |
commit | dab554d10613230ae7a65b8b699572d7244affbc (patch) | |
tree | 7d49e3ea41cf54e27a05fe2a017295c2fe5bcf18 | |
parent | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (diff) |
STORM-1205 Add "Environment" tab to the "Region/Estate" floater
STORM-1201 Mockup: "Create/Edit Sky Preset" floater
STORM-1199 Mockup: "Delete Water/Sky Preset", "Delete Day Cycle" floaters
STORM-1198 Mockup: "Create/Edit Day Cycle" floater
STORM-1197 Mockup: "Create/Edit Water Preset" floater
STORM-1196 Mockup: Environment Settings floater
6 files changed, 2285 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml new file mode 100644 index 0000000000..a7ab5abf38 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<floater + legacy_header_height="18" + height="130" + help_topic="environment_editor_floater" + layout="topleft" + name="Environment Editor Floater" + save_rect="true" + title="DELETE PRESETS" + width="550"> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="50" + name="delete_preset" + top="60" + width="60"> + Setting: + </text> + <combo_box + follows="top|left" + layout="topleft" + left_pad="10" + name="preset_combo" + top_delta="-5" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> + <button + follows="bottom|right" + height="23" + label="Delete" + layout="topleft" + left_pad="15" + name="delete" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="5" + name="cancel" + width="70"/> +</floater> 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 new file mode 100644 index 0000000000..e76059751e --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -0,0 +1,477 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="450" + layout="topleft" + name="Environment Editor Floater" + help_topic="environment_editor_floater" + save_rect="true" + title="Edit Day Cycle" + width="800"> + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="info_string" + top="25" + width="700"> + To edit your preset, adjust the controls then click "Save" + </text> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="info_string" + top_pad="25" + width="120"> + Preset Name: + </text> + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + name="water_preset_combo" + top_delta="-5" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="info_string" + top_delta="0" + width="405" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + <!--======== Controls panel ========--> + <view_border + bevel_style="none" + follows="top|left" + height="300" + layout="topleft" + left="25" + name="water_panel" + top="100" + width="750"/> + <text + follows="top|left|right" + height="10" + layout="topleft" + name="water_preset_help" + right="770" + top="104" + width="100"> + Control Help + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + left="40" + name="water_color_label" + top="125" + width="300"> + - Click on a tab to edit the specific sky settings and time. + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + name="water_color_label" + top_pad="10" + width="300"> + - Click and drag the tabs to set the transition times. + </text> + <text + follows="left|top|right" + height="10" + layout="topleft" + name="water_color_label" + top_pad="10" + width="300"> + - Use the scrubber to preview your day cycle. + </text> + <panel + follows="top|left" + height="100" + name="day_cycle_slider" + layout="topleft" + left_delta="25" + top_pad="25" + width="670"> + <multi_slider + can_edit_text="true" + control_name="WLTimeSlider" + decimal_digits="0" + draw_track="false" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left="20" + max_sliders="20" + max_val="24" + name="WLTimeSlider" + show_text="false" + top_pad="0" + use_triangle="true" + width="525" /> + <multi_slider + can_edit_text="true" + control_name="WLDayCycleKeys" + decimal_digits="0" + follows="bottom" + height="10" + increment="0.0833333" + initial_value="0" + layout="topleft" + left_delta="0" + max_sliders="20" + max_val="24" + name="WLDayCycleKeys" + show_text="false" + top_pad="15" + width="525" /> + <button + height="20" + label="Add Key" + label_selected="Add Key" + layout="topleft" + left_pad="20" + name="WLAddKey" + top_delta="-18" + width="96" /> + <button + height="20" + label="Delete Key" + label_selected="Delete Key" + layout="topleft" + name="WLDeleteKey" + top_pad="5" + width="96" /> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left="8" + name="WL12am" + top="74" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL3am" + top_delta="0" + width="55"> + 3am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL6am" + top_delta="0" + width="55"> + 6am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL9amHash" + top_delta="0" + width="55"> + 9am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL12pmHash" + top_delta="0" + width="55"> + 12pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL3pm" + top_delta="0" + width="55"> + 3pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL6pm" + top_delta="0" + width="55"> + 6pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL9pm" + top_delta="0" + width="55"> + 9pm + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="10" + name="WL12am2" + top_delta="0" + width="55"> + 12am + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left="20" + name="WL12amHash" + top="54" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL3amHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL6amHash" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL9amHash2" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL12pmHash2" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL3pmHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL6pmHash" + top_delta="-3" + width="6"> + | + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="11" + layout="topleft" + left_pad="59" + name="WL9pmHash" + top_delta="3" + width="6"> + I + </text> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="14" + layout="topleft" + left_pad="59" + name="WL12amHash2" + top_delta="-3" + width="6"> + </text> + </panel> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="192" + name="WLCurKeyTimeText2" + top_pad="30" + width="80"> + Sky Setting: + </text> + <combo_box + height="18" + label="Preset" + layout="topleft" + left_pad="5" + name="WLKeyPresets" + width="205" /> + <text + type="string" + length="1" + border_visible="true" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-40" + name="WLCurKeyTimeText2" + top_pad="15" + width="35"> + Time: + </text> + <text_editor + allow_scroll="false" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_pad="3" + name="time" + top_delta="-1" + value="6:00 AM" + width="60"/> + <check_box + follows="top|left" + height="10" + label="Make this preset my new water setting" + layout="topleft" + left="330" + name="new_water_preset_chb" + top="430" + width="280"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..9d180a1f50 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -0,0 +1,1029 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="375" + layout="topleft" + name="Environment Editor Floater" + help_topic="environment_editor_floater" + save_rect="true" + title="Edit Sky Preset" + width="900"> + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="info_string" + top="25" + width="700"> + To edit your preset, adjust the controls then click "Save" + </text> + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="info_string" + top_pad="25" + width="120"> + Preset Name: + </text> + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + name="water_preset_combo" + top_delta="-5" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="info_string" + top_delta="0" + width="405" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + <!--======== Controls panel ========--> + <view_border + border="true" + bevel_style="none" + follows="top|left" + height="225" + layout="topleft" + left="25" + name="panel_water_preset" + top="100" + width="850"/> + <tab_container + follows="left|top" + height="225" + halign="center" + layout="topleft" + left="22" + name="WindLight Tabs" + tab_position="top" + top="101" + width="854"> + <text + follows="top|left|right" + layout="topleft" + name="water_preset_help" + right="870" + top_pad="4" + width="100"> + Control Help + </text> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="ATMOSPHERE" + layout="topleft" + left="1" + mouse_opaque="false" + help_topic="windlight_atmosphere_tab" + name="Atmosphere" + top="60" + width="698"> + + <!--======== Tab Panel I. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="BHText" + top="25" + width="200"> + Blue Horizon + </text> + <slider + control_name="WLBlueHorizonR" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="R" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLBlueHorizonR" + width="200" /> + <slider + control_name="WLBlueHorizonG" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="G" + layout="topleft" + left_delta="0" + name="WLBlueHorizonG" + top_pad="6" + width="200" /> + <slider + control_name="WLBlueHorizonB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="B" + layout="topleft" + name="WLBlueHorizonB" + left_delta="0" + top_pad="6" + width="200" /> + <slider + control_name="WLBlueHorizonI" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="I" + layout="topleft" + name="WLBlueHorizonI" + left_delta="0" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + top_pad="20" + name="BDensText" + width="200"> + Haze Horizon + </text> + <slider + control_name="WLHazeHorizon" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.25" + layout="topleft" + left_delta="15" + top_pad="6" + name="WLHazeHorizon" + width="200" /> + + <!--======== Tab Panel I. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="BDensText2" + top="25" + width="200"> + Blue Density + </text> + <slider + control_name="WLBlueDensityR" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="R" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLBlueDensityR" + width="200" /> + <slider + control_name="WLBlueDensityG" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="G" + layout="topleft" + left_delta="0" + name="WLBlueDensityG" + top_pad="6" + width="200" /> + <slider + control_name="WLBlueDensityB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="B" + layout="topleft" + left_delta="0" + name="WLBlueDensityB" + top_pad="6" + width="200" /> + <slider + control_name="WLBlueDensityI" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1" + label="I" + layout="topleft" + left_delta="0" + name="WLBlueDensityI" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="HDText" + top_pad="20" + width="200"> + Haze Density + </text> + <slider + control_name="WLHazeDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="-15" + max_val="4" + name="WLHazeDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel I. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="DensMultText" + top="25" + width="200"> + Density Multiplier + </text> + <slider + control_name="WLDensityMult" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.1" + layout="topleft" + left_delta="15" + max_val="0.9" + name="WLDensityMult" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLDistanceMultText" + top_pad="20" + width="200"> + Distance Multiplier + </text> + <slider + control_name="WLDistancMult" + decimal_digits="1" + follows="left|top" + height="10" + initial_value="1.0" + layout="topleft" + left_delta="15" + max_val="100" + name="WLDistanceMult" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="MaxAltText" + top_pad="20" + width="200"> + Max Altitude + </text> + <slider + control_name="WLMaxAltitude" + decimal_digits="0" + follows="left|top" + height="10" + increment="1" + initial_value="500" + layout="topleft" + left_delta="15" + max_val="4000" + name="WLMaxAltitude" + top_pad="6" + width="200" /> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="LIGHTING" + layout="topleft" + left_delta="0" + help_topic="windlight_lighting_tab" + name="Lighting" + top_delta="4" + width="698"> + + <!--======== Tab Panel II. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="SLCText" + top="25" + width="200"> + Sun/Moon Color + </text> + <slider + control_name="WLSunlightR" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="R" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLSunlightR" + width="200" /> + <slider + control_name="WLSunlightG" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="G" + layout="topleft" + left_delta="0" + name="WLSunlightG" + top_pad="6" + width="200" /> + <slider + control_name="WLSunlightB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="B" + layout="topleft" + left_delta="0" + name="WLSunlightB" + top_pad="6" + width="200" /> + <slider + control_name="WLSunlightI" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + layout="topleft" + label="I" + left_delta="0" + name="WLSunlightI" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="TODText" + top_pad="20" + width="200"> + Sun/Moon Position + </text> + <icon + height="20" + image_name="icon_diurnal.tga" + layout="topleft" + left_delta="14" + top_pad="10" + name="SkyDayCycle" + use_draw_context_alpha="false" + width="148" /> + <slider + control_name="WLSunAngle" + follows="left|top" + height="10" + increment="0.001" + initial_value="0.7" + layout="topleft" + left_delta="-8" + name="WLSunAngle" + top_pad="0" + width="207" /> + + <!--======== Tab Panel II. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLAmbientText" + top="25" + width="200"> + Ambient + </text> + <slider + control_name="WLAmbientR" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="R" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLAmbientR" + width="200" /> + <slider + control_name="WLAmbientG" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="G" + layout="topleft" + left_delta="0" + name="WLAmbientG" + top_pad="6" + width="200" /> + <slider + control_name="WLAmbientB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="B" + layout="topleft" + left_delta="0" + name="WLAmbientB" + top_pad="6" + width="200" /> + <slider + control_name="WLAmbientI" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1" + label="I" + layout="topleft" + left_delta="0" + name="WLAmbientI" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="WLEastAngleText" + top_pad="20" + width="200"> + East Angle + </text> + <slider + control_name="WLEastAngle" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.0" + layout="topleft" + left_delta="15" + name="WLEastAngle" + top_pad="6" + width="200" /> + + <!--======== Tab Panel II. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="SunGlowText" + top="25" + width="200"> + Sun Glow + </text> + <slider + control_name="WLGlowB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.1" + label="Focus " + layout="topleft" + left_delta="0" + max_val="0.5" + name="WLGlowB" + top_pad="6" + width="200" /> + <slider + control_name="WLGlowR" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="0.25" + label="Size " + layout="topleft" + left_delta="0" + max_val="1.99" + min_val="1" + name="WLGlowR" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="SceneGammaText" + top_pad="20" + width="200"> + Scene Gamma + </text> + <slider + control_name="WLGamma" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="2.0" + layout="topleft" + left_delta="0" + max_val="10" + name="WLGamma" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="WLStarText" + top_pad="20" + width="200"> + Star Brightness + </text> + <slider + control_name="WLStarAlpha" + decimal_digits="2" + follows="top|left" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + max_val="2" + name="WLStarAlpha" + top_pad="6" + width="200" /> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right|bottom" + height="196" + label="CLOUDS" + layout="topleft" + left_delta="0" + mouse_opaque="false" + help_topic="windlight_clouds_tab" + name="Clouds" + top_delta="4" + width="698"> + + <!--======== Tab Panel III. I conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="40" + name="WLCloudColorText" + top="25" + width="200"> + Cloud Color + </text> + <slider + control_name="WLCloudColorR" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="R" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudColorR" + width="200" /> + <slider + control_name="WLCloudColorG" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="G" + layout="topleft" + left_delta="0" + name="WLCloudColorG" + top_pad="6" + width="200" /> + <slider + control_name="WLCloudColorB" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + label="B" + layout="topleft" + left_delta="0" + name="WLCloudColorB" + top_pad="6" + width="200" /> + <slider + control_name="WLCloudColorI" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="I" + layout="topleft" + left_delta="0" + name="WLCloudColorI" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="0" + name="WLCloudColorText2" + top_pad="20" + width="200"> + Cloud XY/Density + </text> + <slider + control_name="WLCloudX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="X" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudX" + width="200" /> + <slider + control_name="WLCloudY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="Y" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudY" + width="200" /> + <slider + control_name="WLCloudDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="D" + layout="topleft" + left_delta="0" + name="WLCloudDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel III. II conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLCloudCoverageText" + top="25" + width="200"> + Cloud Coverage + </text> + <slider + control_name="WLCloudCoverage" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="15" + name="WLCloudCoverage" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLCloudScaleText" + top_pad="20" + width="200"> + Cloud Scale + </text> + <slider + control_name="WLCloudScale" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + layout="topleft" + left_delta="15" + min_val="0.01" + name="WLCloudScale" + top_pad="6" + width="200" /> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-13" + name="WLCloudDetailText" + top_pad="20" + width="200"> + Cloud Detail (XY/Density) + </text> + <slider + control_name="WLCloudDetailX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="X" + layout="topleft" + left_delta="0" + top_pad="6" + name="WLCloudDetailX" + width="200" /> + <slider + control_name="WLCloudDetailY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + label="Y" + layout="topleft" + left_delta="0" + name="WLCloudDetailY" + top_pad="6" + width="200" /> + <slider + control_name="WLCloudDetailDensity" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="1.0" + label="D" + layout="topleft" + left_delta="0" + name="WLCloudDetailDensity" + top_pad="6" + width="200" /> + + <!--======== Tab Panel III. III conlumn of controls ========--> + + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_pad="55" + name="WLCloudScrollXText" + top="25" + width="150"> + Cloud Scroll X + </text> + <check_box + control_name="WLCloudLockX" + follows="left|top" + height="16" + label="Lock" + layout="topleft" + left_delta="150" + name="WLCloudLockX" + top_delta="0" + width="200" /> + <slider + control_name="WLCloudScrollX" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="-135" + max_val="10" + min_val="-10" + name="WLCloudScrollX" + top_pad="6" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WLCloudScrollYText" + top_pad="20" + width="150"> + Cloud Scroll Y + </text> + <check_box + control_name="WLCloudLockY" + follows="left|top" + height="16" + label="Lock" + layout="topleft" + left_delta="150" + name="WLCloudLockY" + width="200" /> + <slider + control_name="WLCloudScrollY" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_delta="-135" + max_val="10" + min_val="-10" + name="WLCloudScrollY" + top_pad="6" + width="200" /> + <check_box + control_name="DrawClassicClouds" + follows="left|top" + height="16" + label="Draw Classic Clouds" + layout="topleft" + left_delta="-15" + name="DrawClassicClouds" + top_pad="20" + width="200" /> + </panel> + </tab_container> +<!--======== End of Controls panel ========--> + + <check_box + follows="top|left" + height="10" + label="Make this preset my new sky setting" + layout="topleft" + left="430" + name="new_water_preset_chb" + top_pad="30" + width="280"/> + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml new file mode 100644 index 0000000000..a29c725ee9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml @@ -0,0 +1,439 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="450" + layout="topleft" + name="Environment Editor Floater" + help_topic="environment_editor_floater" + save_rect="true" + title="Edit Water Preset" + width="900"> + + <text + follows="top|left|right" + height="10" + layout="topleft" + left="30" + name="info_string" + top="25" + width="700"> + To edit your preset, adjust the controls then click "Save" + </text> + + <text + follows="top|left|right" + font="SansSerif" + height="10" + layout="topleft" + left="30" + name="info_string" + top_pad="25" + width="120"> + Preset Name: + </text> + + <combo_box + allow_text_entry="true" + follows="top|left" + layout="topleft" + left_pad="10" + name="water_preset_combo" + top_delta="-5" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> + + <text + follows="top|left|right" + height="40" + layout="topleft" + left_pad="10" + name="info_string" + top_delta="0" + width="405" + wrap="true"> + Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. + </text> + + <!--======== Controls panel ========--> + <panel + border="true" + bevel_style="none" + follows="top|left" + height="300" + layout="topleft" + left="25" + name="panel_water_preset" + top="100" + width="850"> + + <text + follows="top|left|right" + layout="topleft" + name="water_preset_help" + right="870" + top_pad="4" + width="100"> + Control Help + </text> + +<!--======== I conlumn of controls ========--> + <text + follows="left|top|right" + height="10" + font="SansSerif" + layout="topleft" + left="40" + name="water_color_label" + top="25" + width="200"> + Water Fog Color + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="60" + layout="topleft" + left_delta="15" + name="WaterFogColor" + top_pad="8" + width="60" /> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + top_pad="0" + name="water_fog_destiny_label" + width="200"> + Fog Destiny Exponent + </text> + <slider + decimal_digits="1" + follows="left|top" + height="10" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="10" + name="fog_destiny_exponent" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + top_pad="15" + name="underwater_fog_modifier_label" + width="200"> + Underwater For Modifier + </text> + <slider + decimal_digits="1" + follows="left|top" + height="10" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="10" + name="underwater_fog_modifier" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="BHText" + top_pad="15" + width="200"> + Big Wave Direction + </text> + <slider + control_name="WaterWave1DirX" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="X" + layout="topleft" + max_val="4" + min_val="-4" + name="water_wave_direction_x" + top_pad="10" + width="216"/> + <slider + control_name="WaterWave1DirY" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="Y" + layout="topleft" + max_val="4" + min_val="-4" + name="water_wave_direction_y" + top_pad="5" + width="216"/> + +<!--======== II conlumn of controls ========--> + + <text + follows="left|top|right" + font="SansSerif" + height="10" + layout="topleft" + left_pad="55" + name="BDensText" + top="25" + width="200"> + Reflection Wavelet Scale + </text> + <slider + control_name="WaterNormalScaleX" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + left_delta="15" + max_val="10" + name="WaterNormalScaleX" + top_pad="10" + width="200"/> + <slider + control_name="WaterNormalScaleY" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + max_val="10" + name="WaterNormalScaleY" + top_pad="6" + width="200"/> + <slider + control_name="WaterNormalScaleZ" + decimal_digits="1" + follows="left|top" + initial_value="0.7" + layout="topleft" + max_val="10" + name="WaterNormalScaleZ" + top_pad="6" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="HDText" + top_pad="16" + width="200"> + Fresnel Scale + </text> + <slider + control_name="WaterFresnelScale" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="15" + name="WaterFresnelScale" + top_pad="10" + width="200"/> + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="FresnelOffsetText" + top_pad="15" + width="200"> + Fresnel Offset + </text> + <slider + control_name="WaterFresnelOffset" + decimal_digits="2" + follows="left" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="15" + name="WaterFresnelOffset" + top_pad="10" + width="200"/> + + + <text + follows="left|top|right" + font="SansSerif" + layout="topleft" + left_delta="-15" + name="BHText2" + top_pad="15" + width="200"> + Little Wave Direction + </text> + <slider + control_name="WaterWave2DirX" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="X" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave2DirX" + top_pad="10" + width="216" /> + <slider + control_name="WaterWave2DirY" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + label="Y" + layout="topleft" + max_val="4" + min_val="-4" + name="WaterWave2DirY" + top_pad="6" + width="216" /> + +<!--======== III conlumn of contorls ========--> + + <text + follows="left|top|right" + font="SansSerif" + height="10" + layout="topleft" + left_pad="55" + name="DensMultText" + top="25" + width="200"> + Refract Scale Above + </text> + <slider + control_name="WaterScaleAbove" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.1" + layout="topleft" + left_delta="15" + name="WaterScaleAbove" + top_pad="10" + width="200" /> + + <text + type="string" + length="1" + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="WaterScaleBelowText" + top_pad="15" + width="200"> + Refract Scale Below + </text> + <slider + control_name="WaterScaleBelow" + decimal_digits="2" + follows="left|top" + height="10" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="15" + name="WaterScaleBelow" + top_pad="10" + width="200"/> + + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-15" + name="MaxAltText" + top_pad="15" + width="200"> + Blur Multiplier + </text> + <slider + control_name="WaterBlurMult" + follows="left|top" + height="10" + increment="0.001" + initial_value="0" + layout="topleft" + left_delta="15" + max_val="0.16" + name="WaterBlurMult" + top_pad="10" + width="200"/> + + <text + follows="left|top|right" + font="SansSerif" + height="10" + layout="topleft" + left_delta="-15" + name="BHText3" + top_pad="15" + width="200"> + Normal Map + </text> + <texture_picker + height="100" + layout="topleft" + left_delta="15" + name="WaterNormalMap" + top_delta="22" + width="100" /> + </panel> +<!--======== End of Controls panel ========--> + <check_box + follows="top|left" + height="10" + label="Make this preset my new water setting" + layout="topleft" + left="430" + name="new_water_preset_chb" + top_pad="30" + width="280"/> + + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml new file mode 100644 index 0000000000..77cad2a2bd --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="400" + layout="topleft" + name="Environment Editor Floater" + help_topic="environment_editor_floater" + save_rect="true" + title="ENVIRONMENT EDITOR" + width="600"> + + <!-- Water Settings --> + <view_border + bevel_style="none" + follows="top|left" + height="100" + layout="topleft" + left="50" + name="water_panel" + top="50" + width="500"/> + <text + name="water_settings_title" + follows="top|left" + height="16" + layout="topleft" + left_delta="5" + top_delta="5" + width="35"> + Water + </text> + + <radio_group + follows="top|left" + height="45" + layout="topleft" + name="water_settings_radio_group" + top_pad="20" + width="200"> + <radio_item + label="Use region settings" + layout="topleft" + name="region_water_settings"/> + <radio_item + label="Use my settings" + layout="topleft" + name="my_water_settings" + top_pad="20"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="water_settings_preset_combo" + top_delta="24" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> + + + <!-- Sky/Day Cycle Settings --> + <view_border + bevel_style="none" + follows="top|left" + height="180" + layout="topleft" + left="50" + name="sky_dayc_panel" + top="175" + width="500"/> + <text + name="sky_dayc_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="55" + top_delta="5" + width="100"> + Sky / Day Cycle + </text> + + <radio_group + follows="top|left" + height="45" + layout="topleft" + name="sky_dayc_settings_radio_group1" + top_pad="20" + width="200"> + <radio_item + layout="topleft" + label="Use region settings" + name="region_sky_dayc_settings"/> + <radio_item + layout="topleft" + label="Use my settings" + name="my_sky_dayc_settings" + top_pad="20"/> + </radio_group> + + <radio_group + layout="topleft" + left_delta="50" + name="sky_dayc_settings_radio_group2" + top_pad="10" + height="50" + width="150"> + <radio_item + layout="topleft" + label="Fixed sky" + name="my_sky_settings"/> + <radio_item + layout="topleft" + label="Day cycle" + name="my_dayc_settings" + top_pad="25"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="sky_settings_preset_combo" + top_delta="-7" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> + <combo_box + follows="top|left" + name="dayc_settings_preset_combo" + top_delta="36" + width="200"> + <combo_box.item + label="-Select a preset-" + name="item0" + value="any" /> + </combo_box> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 32fb6f97e7..017c70cf49 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -16,5 +16,154 @@ name="region_panels" right="-1" tab_position="top" - top="20" /> + top="20"> + + <!-- Temporary panel. It will be deleted from this xml. It'll be added the same way as others tab panels --> + <panel + border="true" + bevel_style="none" + follows="top|left" + height="320" + label="Emvironment" + layout="topleft" + left="0" + name="environment_tab" + width="4250"> + + <!-- Water Settings --> + <view_border + bevel_style="none" + follows="top|left" + height="100" + layout="topleft" + left="50" + name="water_panel" + top="50" + width="430"/> + <text + name="water_settings_title" + follows="top|left" + height="16" + layout="topleft" + left_delta="5" + top_delta="5" + width="35"> + Water + </text> + + <radio_group + follows="top|left" + height="45" + layout="topleft" + name="water_settings_radio_group" + top_pad="20" + width="200"> + <radio_item + label="Use region settings" + layout="topleft" + name="region_water_settings"/> + <radio_item + label="Use my settings" + layout="topleft" + name="my_water_settings" + top_pad="20"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="water_settings_preset_combo" + top_delta="24" + width="200"> + </combo_box> + + + <!-- Sky/Day Cycle Settings --> + <view_border + bevel_style="none" + follows="top|left" + height="180" + layout="topleft" + left="50" + name="sky_dayc_panel" + top="175" + width="430"/> + <text + name="sky_dayc_settings_title" + follows="top|left" + height="16" + layout="topleft" + left="55" + top_delta="5" + width="100"> + Sky / Day Cycle + </text> + + <radio_group + follows="top|left" + height="45" + layout="topleft" + name="sky_dayc_settings_radio_group1" + top_pad="20" + width="200"> + <radio_item + layout="topleft" + label="Use region settings" + name="region_sky_dayc_settings"/> + <radio_item + layout="topleft" + label="Use my settings" + name="my_sky_dayc_settings" + top_pad="20"/> + </radio_group> + + <radio_group + layout="topleft" + left_delta="50" + name="sky_dayc_settings_radio_group2" + top_pad="10" + height="50" + width="150"> + <radio_item + layout="topleft" + label="Fixed sky" + name="my_sky_settings"/> + <radio_item + layout="topleft" + label="Day cycle" + name="my_dayc_settings" + top_pad="25"/> + </radio_group> + <combo_box + follows="top|left" + left_pad="2" + name="sky_settings_preset_combo" + top_delta="-7" + width="200"> + </combo_box> + <combo_box + follows="top|left" + name="dayc_settings_preset_combo" + top_delta="36" + width="200"> + </combo_box> + + <button + follows="bottom|right" + height="23" + label="Save" + layout="topleft" + left_pad="0" + name="save" + width="70"/> + <button + follows="bottom|right" + height="23" + label="Cancel" + layout="topleft" + left_pad="15" + name="cancel" + width="70"/> + </panel> + + </tab_container> </floater> |