livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80 from williamweaver/phototools 

Implement substantial UI overhaul and feature expansion for Phototool…
meow-7.2.2
Beq Janus 2025-02-18 18:41:32 +00:00 committed by GitHub
parent f2244decff 6465d08b41
commit e70e41e289
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 3752 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llfloaterfixedenvironment.cpp
View File

@ -419,7 +419,10 @@ bool LLFloaterFixedEnvironmentWater::postBuild()
LLPanelSettingsWater * panel;
panel = new LLPanelSettingsWaterMainTab;
panel->buildFromFile("panel_settings_water.xml");
// <FS:William_W:PanelFileReplace> [PhotoTools] Use FS specific panel XML for Water Settings
// panel->buildFromFile("panel_settings_water.xml"); // Original LL line - using default panel XML
panel->buildFromFile("panel_fs_settings_water.xml"); // Using FS specific panel XML
// </FS:William_W:PanelFileReplace>
panel->setWater(std::static_pointer_cast<LLSettingsWater>(mSettings));
panel->setOnDirtyFlagChanged( [this] (LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(true));
@ -479,26 +482,35 @@ LLFloaterFixedEnvironmentSky::LLFloaterFixedEnvironmentSky(const LLSD &key) :
LLFloaterFixedEnvironment(key)
{}
bool LLFloaterFixedEnvironmentSky::postBuild()
bool LLFloaterFixedEnvironmentSky::postBuild() // <--- Corrected: Only one declaration now
{
if (!LLFloaterFixedEnvironment::postBuild())
return false;
LLPanelSettingsSky * panel;
panel = new LLPanelSettingsSkyAtmosTab;
panel->buildFromFile("panel_settings_sky_atmos.xml");
// <FS:William_W:PanelFileReplace> [PhotoTools] Use FS specific panel XML for Sky Atmosphere Settings
// panel->buildFromFile("panel_settings_sky_atmos.xml"); // Original LL line - using default panel XML
panel->buildFromFile("panel_fs_settings_sky_atmos.xml"); // Using FS specific panel XML
// </FS:William_W:PanelFileReplace>
panel->setSky(std::static_pointer_cast<LLSettingsSky>(mSettings));
panel->setOnDirtyFlagChanged([this](LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(true));
panel = new LLPanelSettingsSkyCloudTab;
panel->buildFromFile("panel_settings_sky_clouds.xml");
// <FS:William_W:PanelFileReplace> [PhotoTools] Use FS specific panel XML for Sky Cloud Settings
// panel->buildFromFile("panel_settings_sky_clouds.xml"); // Original LL line - using default panel XML
panel->buildFromFile("panel_fs_settings_sky_clouds.xml"); // Using FS specific panel XML
// </FS:William_W:PanelFileReplace>
panel->setSky(std::static_pointer_cast<LLSettingsSky>(mSettings));
panel->setOnDirtyFlagChanged([this](LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(false));
panel = new LLPanelSettingsSkySunMoonTab;
panel->buildFromFile("panel_settings_sky_sunmoon.xml");
// <FS:William_W:PanelFileReplace> [PhotoTools] Use FS specific panel XML for Sky Sun Moon Settings
// panel->buildFromFile("panel_settings_sky_sunmoon.xml"); // Original LL line - using default panel XML
panel->buildFromFile("panel_fs_settings_sky_sunmoon.xml"); // Using FS specific panel XML
// </FS:William_W:PanelFileReplace>
panel->setSky(std::static_pointer_cast<LLSettingsSky>(mSettings));
panel->setOnDirtyFlagChanged([this](LLPanel *, bool value) { onPanelDirtyFlagChanged(value); });
mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(false));

14
indra/newview/llviewerfloaterreg.cpp
View File

@ -435,9 +435,13 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("emoji_picker", "floater_emoji_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiPicker>);
LLFloaterReg::add("emoji_complete", "floater_emoji_complete.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiComplete>);
LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>);
LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>);
// <FS:William_W:EnvFileReplace> [PhotoTools] Use FS specific XML for Fixed Environment Floater
//LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>); // Commenting out original LL line
LLFloaterReg::add("env_fixed_environmentent_water", "floater_fs_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>); // Using FS specific floater XML
// <FS:William_W:EnvFileReplace> [PhotoTools] Use FS specific XML for Fixed Environment Floater
//LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>); // Commenting out original LL line
LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fs_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>); // Using FS specific floater XML
LLFloaterReg::add("env_adjust_snapshot", "floater_adjust_environment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEnvironmentAdjust>);
@ -652,7 +656,9 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("money_tracker", "floater_fs_money_tracker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSMoneyTracker>);
LLFloaterReg::add("particle_editor","floater_particle_editor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<ParticleEditor>);
LLFloaterReg::add("performance", "floater_fs_performance.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterPerformance>);
LLFloaterReg::add(PHOTOTOOLS_FLOATER, "floater_phototools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FloaterQuickPrefs>);
// <FS:William_W:FixPhototoolsTypo> [PhotoTools] Corrected typo in Phototools floater registration - using string literal instead of PHOTOTOOLS_FLOATER constant (likely intended).
// LLFloaterReg::add(PHOTOTOOLS_FLOATER, "floater_phototools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FloaterQuickPrefs>); // Original line with likely typo
LLFloaterReg::add("phototools", "floater_phototools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FloaterQuickPrefs>); // Corrected line - using string literal "phototools"
LLFloaterReg::add("phototools_camera", "floater_phototools_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
LLFloaterReg::add("quickprefs", "floater_quickprefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FloaterQuickPrefs>);
LLFloaterReg::add("region_tracker", "floater_region_tracker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<ALFloaterRegionTracker>);

177
indra/newview/skins/default/xui/en/floater_fs_fixedenvironment.xml Normal file
View File

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
can_tear_off="false"
can_resize="false"
can_drag_on_left="false"
can_close="true"
can_dock="false"
bevel_style="in"
height="463"
layout="topleft"
name="Fixed Environment"
save_rect="true"
title="Fixed Environment"
save_visibility="false"
help_topic="fs_fixed_environment"
single_instance="true"
width="288">
<string name="edit_sky">Edit Sky:</string>
<string name="edit_water">Edit Water:</string>
<layout_stack name="floater_stack"
left="0"
top="0"
right="-1"
bottom="-1"
follows="left|top|right|bottom"
orientation="vertical">
<layout_panel name="info_panel"
auto_resize="false"
user_resize="false"
height="23"
width="288">
<text
follows="left|top"
top="5"
left="0"
width="40"
height="15"
name="info_panel_label"
font="SansSerif">
Name:
</text>
<line_editor
follows="left|top"
top_delta="-2"
left_pad="3"
width="235"
name="settings_name"
prevalidator="ascii"
max_length_chars="63"
height="20"/>
<!--
<button
height="23"
label="Load"
follows="left|top"
left_delta="260"
font="SansSerif"
top_delta="-2"
name="btn_load"
tool_tip="Load a settings from inventory"
width="96" />
<button
height="23"
label="Import"
follows="right|top"
right="-10"
font="SansSerif"
top_delta="0"
name="btn_import"
tool_tip="Import legacy settings from disk."
width="96" />
-->
</layout_panel>
<layout_panel name="tab_area"
auto_resize="true"
user_resize="false"
height="11"
min_height="0"
visible="true">
<tab_container
follows="all"
halign="center"
layout="topleft"
left="0"
name="tab_settings"
tab_position="top"
tab_max_width="93"
tab_width="90"
top_pad="0">
<!-- Tabs inserted here in code -->
</tab_container>
</layout_panel>
<layout_panel name="button_panel"
follows="left|top|right|bottom"
auto_resize="false"
user_resize="false"
height="23"
visible="true">
<layout_stack
follows="all"
height="23"
layout="topleft"
mouse_opaque="false"
name="button_bar_ls"
left="0"
orientation="horizontal"
top="0"
width="288">
<layout_panel
follows="bottom|left|right"
height="25"
layout="topleft"
left="0"
mouse_opaque="false"
name="load_btn_lp"
width="288">
<button
height="23"
label="Load"
follows="left|top"
left="5"
layout="topleft"
name="btn_load"
top="0"
width="70"
tool_tip="Load a settings from inventory"/>
<button
height="23"
label="Import"
follows="left|top"
left_pad="0"
layout="topleft"
name="btn_import"
top_delta="0"
width="70"
tool_tip="Import legacy settings from disk."/>
<button
height="23"
label="Save"
follows="left|top"
left_pad="0"
layout="topleft"
name="btn_commit"
top="0"
width="50" />
<button
follows="right|top"
height="23"
name="btn_flyout"
label=""
layout="topleft"
top="0"
left_pad="0"
tab_stop="false"
image_selected="SegmentedBtn_Right_Selected_Press"
image_unselected="SegmentedBtn_Right_Off"
image_pressed="SegmentedBtn_Right_Press"
image_pressed_selected="SegmentedBtn_Right_Selected_Press"
image_overlay="Arrow_Small_Up"
width="20"/>
<button
height="23"
label="Cancel"
follows="right|top"
left_pad="0"
layout="topleft"
name="btn_cancel"
top="0"
tool_tip="Revert to last saved version"
width="70"/>
</layout_panel>
</layout_stack>
</layout_panel>
</layout_stack>
</floater>

2731
indra/newview/skins/default/xui/en/floater_phototools.xml
View File

File diff suppressed because it is too large Load Diff

431
indra/newview/skins/default/xui/en/panel_fs_settings_sky_atmos.xml Normal file
View File

@ -0,0 +1,431 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="all"
height="390"
label="Atmosphere"
layout="topleft"
left="0"
help_topic="fs_skies"
name="panel_fs_settings_sky_atmos"
top="0">
<string name="hdr_string">HDR Scale:</string>
<string name="brightness_string">Brightness:</string>
<string name="hdr_tooltip">Intensity of lighting effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
<panel
name="P_Atmosphere_Header"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
background_visible="true">
<text
name="T_Atmosphere_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Atmospheric Colors"/>
</panel>
<panel
name="P_Atmos_Settings"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="87"
border_visible="true"
background_visible="true">
<text
name="ambient_color_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="10"
width="105">
Ambient Color:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="25"
label_height="0"
layout="topleft"
left_pad="0"
name="ambient_light"
top_delta="-5"
width="166" />
<text
name="blue_horizon_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="7"
width="105">
Blue Horizon:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="25"
label_height="0"
layout="topleft"
left_pad="0"
name="blue_horizon"
top_delta="-5"
width="166" />
<text
name="blue_density_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="7"
width="105">
Blue Density:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="25"
label_height="0"
layout="topleft"
left_pad="0"
name="blue_density"
top_delta="-5"
width="166" />
</panel>
<panel
name="P_Atmosphere_Header"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
background_visible="true">
<text
name="T_Atmosphere_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Atmosphere Settings"/>
</panel>
<panel
name="P_Atmosphere_OtherSettings"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="149"
border_visible="true"
background_visible="true">
<text
name="haze_horizon_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
top_pad="7"
width="100">
Haze Horizon:
</text>
<slider
decimal_digits="3"
follows="left|top"
height="16"
increment="0.001"
initial_value="0"
layout="topleft"
min_val="0"
max_val="5"
name="haze_horizon"
left_pad="0"
width="171"
can_edit_text="true"/>
<text
name="haze_density_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Haze Density:
</text>
<slider
decimal_digits="3"
follows="left|top"
height="16"
increment="0.001"
initial_value="0"
layout="topleft"
min_val="0"
max_val="5"
name="haze_density"
left_pad="0"
width="171"
can_edit_text="true"/>
<text
name="density_multiplier_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Density Multiplier:
</text>
<slider
decimal_digits="4"
follows="left|top"
height="16"
increment="0.0001"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="2"
name="density_multip"
width="171"
can_edit_text="true"/>
<text
name="distance_multiplier_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Distance Multiplier:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0.8"
layout="topleft"
min_val="0"
max_val="1000"
name="distance_multip"
left_pad="0"
width="171"
can_edit_text="true"/>
<text
name="maximum_altitude_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Maximum Altitide:
</text>
<slider
decimal_digits="1"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="10000"
name="max_alt"
width="171"
can_edit_text="true"/>
<text
name="scene_gamma_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Brightness:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.1"
initial_value="0"
layout="topleft"
max_val="100"
name="scene_gamma"
left_pad="0"
width="171"
can_edit_text="true"/>
<text
name="probe_ambiance_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
tool_tip="Irradiance control. When not zero, enables HDR lighting model."
width="100"
word_wrap="true">
Reflection Probe Ambiance (HDR):
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.5"
initial_value="0"
layout="topleft"
max_val="100"
name="probe_ambiance"
left_pad="0"
width="171"
can_edit_text="true"/>
</panel>
<panel
name="P_Rainbow_Header"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
border_thickness="1"
background_visible="true">
<text
name="T_Rainbow_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Rainbow and Halo Settings"
width="250"/>
</panel>
<panel
name="P_Rainbow_OtherSettings"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="63"
border_visible="true"
background_visible="true">
<text
name="moisture_level_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
top_pad="7"
width="100">
Moisture Level:
</text>
<slider
decimal_digits="3"
follows="left|top"
height="16"
increment="0.001"
initial_value="0"
left_pad="0"
layout="topleft"
min_val="0"
max_val="1"
name="moisture_level"
width="171"
can_edit_text="true"/>
<text
name="droplet_radius_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Droplet Radius:
</text>
<slider
decimal_digits="3"
follows="left|top"
height="16"
increment="0.001"
initial_value="0"
left_pad="0"
layout="topleft"
min_val="0"
max_val="1000.0"
name="droplet_radius"
width="171"
can_edit_text="true"/>
<text
name="ice_level_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Ice Level:
</text>
<slider
decimal_digits="3"
follows="left|top"
height="16"
increment="0.001"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="1"
name="ice_level"
width="171"
can_edit_text="true"/>
</panel>
</panel>

439
indra/newview/skins/default/xui/en/panel_fs_settings_sky_clouds.xml Normal file
View File

@ -0,0 +1,439 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="all"
height="390"
label="Clouds"
layout="topleft"
left="0"
help_topic="fs_skies"
name="panel_fs_settings_sky_clouds"
top="0">
<panel
name="P_Clouds_Header"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
border_thickness="1"
background_visible="true">
<text
name="T_Clouds_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Cloud Settings"/>
</panel>
<panel
name="P_Atmos_Settings"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="35"
border_visible="true"
background_visible="true">
<text
name="cloud_color_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="10"
width="105">
Cloud Color:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="25"
label_height="0"
layout="topleft"
left_pad="0"
name="cloud_color"
top_delta="-5"
width="166" />
</panel>
<panel
name="P_Cloud_Density"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="63"
border_visible="true"
background_visible="true">
<text
name="cloud_coverage_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
top_pad="7"
width="100">
Cloud Cover:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="0"
max_val="1"
name="cloud_coverage"
left_pad="0"
width="171"
can_edit_text="true"/>
<text
name="cloud_scale_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Cloud Scale:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="0"
max_val="3"
name="cloud_scale"
left_pad="0"
width="171"
can_edit_text="true"/>
<text
name="cloud_variance_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="100">
Cloud Variance:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="0"
max_val="1.0"
name="cloud_variance"
left_pad="0"
width="171"
can_edit_text="true"/>
</panel>
<panel
name="P_Cloud_Density"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="77"
border_visible="true"
background_visible="true">
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="3"
name="cloud_density_label"
top_pad="5"
tool_tip="Cloud XY/Density - Use the X and Y sliders to change the horizontal position of all clouds in the sky. The D slider affects the overall density of the individual clouds; at low settings you will see thin, wispy clouds, and at higher settings you will see thicker, more solid clouds.">
Cloud Density:
</text>
<text
name="Cloud_XY_Density_X"
follows="left|top"
height="15"
layout="topleft"
left="5"
top_pad="0"
width="15">
X:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="1"
name="cloud_density_x"
width="255"
can_edit_text="true"/>
<text
name="Cloud_XY_Density_Y"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="15">
Y:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="1"
name="cloud_density_y"
width="255"
can_edit_text="true"/>
<text
name="Cloud_XY_Density_D"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="15">
D:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="3"
name="cloud_density_d"
width="255"
can_edit_text="true"/>
</panel>
<panel
name="P_Cloud_Detail"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="77"
border_visible="true"
background_visible="true">
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="3"
name="cloud_detail_label"
top_pad="5"
tool_tip="Cloud Density - Use the X and Y sliders to change the horizontal position of all clouds in the sky. The D slider affects the overall density of the individual clouds; at low settings you will see thin, wispy clouds, and at higher settings you will see thicker, more solid clouds."
width="240">
Cloud Detail:
</text>
<text
name="Cloud_XY_Detail_X"
follows="left|top"
height="15"
layout="topleft"
left="5"
top_pad="0"
width="15">
X:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="1"
name="cloud_detail_x"
width="255"
can_edit_text="true"/>
<text
name="Cloud_XY_Detail_Y"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="15">
Y:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="1"
name="cloud_detail_y"
width="255"
can_edit_text="true"/>
<text
name="Cloud_XY_Detail_D"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="15">
D:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="1"
name="cloud_detail_d"
width="255"
can_edit_text="true"/>
</panel>
<panel
name="P_Cloud_Scroll"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="103"
border_visible="true"
background_visible="true">
<text
name="cloud_scroll_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="5"
width="134">
Cloud Scroll:
</text>
<text
name="cloud_image_label"
follows="left|top"
height="10"
layout="topleft"
left_pad="1"
top_delta="0"
width="134">
Cloud Image:
</text>
<xy_vector
follows="left|top"
name="cloud_scroll_xy"
width="80"
height="80"
visible="true"
left="5"
top_pad="5"
min_val_x="-30"
max_val_x="30"
min_val_y="-30"
max_val_y="30"
logarithmic="1"/>
<texture_picker
height="100"
layout="topleft"
left_pad="55"
name="cloud_map"
top_delta="0"
width="80"/>
<!--
<text
name="cloud_image_label"
follows="left|top"
height="10"
layout="topleft"
left_pad="3"
top_delta="0"
width="50">
Image:
</text>
-->
<!--/layout_panel>
<layout_panel
name="right_lp"
border="true"
bevel_style="in"
auto_resize="true"
user_resize="false"
visible="true"
height="75"-->
<!--/layout_panel>
</layout_stack-->
</panel>
</panel>

444
indra/newview/skins/default/xui/en/panel_fs_settings_sky_sunmoon.xml Normal file
View File

@ -0,0 +1,444 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="all"
height="390"
label="Sun &amp; Moon"
layout="topleft"
left="0"
help_topic="fs_skies"
name="panel_fs_settings_sky_hbodies"
top="0">
<panel
name="P_Sun_Color"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
border_thickness="1"
background_visible="true">
<text
name="T_Sun_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Sun &amp; Moon Color"/>
</panel>
<panel
name="P_SM_Color"
follows="left|top"
layout="topleft"
top_pad="5"
left="3"
width="280"
height="35"
border_visible="true"
background_visible="true">
<text
name="color_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="10"
width="105">
Sun &amp; Moon Color:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="25"
label_height="0"
layout="topleft"
left_pad="0"
name="sun_moon_color"
top_delta="-5"
width="166" />
</panel>
<panel
name="P_Sun_Header"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
border_thickness="1"
background_visible="true">
<text
name="T_Sun_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Sun &amp; Stars Settings"/>
</panel>
<panel
name="P_Sun_Setting"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="145"
border_visible="true"
background_visible="true">
<text
name="image_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="5"
width="180">
Image:
</text>
<check_box
control_name="sunbeacon"
width="60"
height="16"
label="Show Beacon"
layout="topleft"
name="sunbeacon"
top_delta="0"
left_pad="0"/>
<texture_picker
height="83"
layout="topleft"
left="5"
name="sun_image"
top_pad="0"
width="60"/>
<text
name="glow_focus_label"
follows="left|top"
height="15"
layout="topleft"
left_pad="5"
top_delta="10"
width="85">
Glow Focus:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="-2"
max_val="2"
name="glow_focus"
left_pad="0"
width="120"
can_edit_text="true"/>
<text
name="glow_size_label"
follows="left|top"
height="15"
layout="topleft"
left="70"
width="85">
Glow Size:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="10"
name="glow_size"
width="120"
can_edit_text="true"/>
<text
name="star_brightness_label"
follows="left|top"
height="15"
layout="topleft"
left="70"
width="85">
Star Brightness:
</text>
<slider
decimal_digits="0"
follows="left|top"
height="16"
increment="1"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="50000"
name="star_brightness"
width="120"
can_edit_text="true"/>
<text
name="sun_scale_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="55">
Scale:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
top_delta="0"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0.0"
max_val="100"
name="sun_scale"
width="215"
can_edit_text="true"/>
<text
name="sun_azimuth_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="55">
Azimuth:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="359.99"
name="sun_azimuth"
width="215"
can_edit_text="true"/>
<text
name="sun_elevation_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="55">
Elevation:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="-90"
max_val="90"
name="sun_elevation"
left_pad="0"
width="215"
can_edit_text="true"/>
</panel>
<panel
name="P_Moon_Header"
follows="left|top"
layout="topleft"
top_pad="3"
left="0"
width="288"
height="22"
bg_alpha_color="EmphasisColor"
border_visible="true"
border_thickness="1"
background_visible="true">
<text
name="T_Moon_Header"
follows="left|top"
layout="topleft"
left="5"
font="SansSerif"
value="Moon Settings"/>
</panel>
<panel
name="P_Moon_Setting"
follows="left|top"
layout="topleft"
top_pad="1"
left="3"
width="280"
height="125"
border_visible="true"
background_visible="true">
<text
name="moon_image_label"
follows="left|top"
height="10"
layout="topleft"
left="5"
top_pad="5"
width="180">
Image:
</text>
<check_box
control_name="moonbeacon"
width="60"
height="16"
label="Show Beacon"
layout="topleft"
name="moonbeacon"
top_delta="0"
left_pad="0"/>
<texture_picker
height="83"
layout="topleft"
left="5"
name="moon_image"
top_pad="0"
width="60"/>
<text
name="moon_scale_label"
follows="left|top"
height="15"
layout="topleft"
left_pad="5"
top_delta="28"
width="60">
Scale:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
top_delta="0"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="20"
name="moon_scale"
width="145"
can_edit_text="true"/>
<text
name="brightness_label"
follows="left|top"
height="15"
layout="topleft"
left="70"
width="60">
Brightness:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="0.0"
max_val="1.0"
name="moon_brightness"
left_pad="0"
width="145"
can_edit_text="true"/>
<text
name="moon_azimuth_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="55">
Azimuth:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="359.99"
name="moon_azimuth"
width="215"
can_edit_text="true"/>
<text
name="moon_elevation_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="55">
Elevation:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="-90"
max_val="90"
name="moon_elevation"
left_pad="0"
width="215"
can_edit_text="true"/>
</panel>
</panel>

389
indra/newview/skins/default/xui/en/panel_fs_settings_water.xml Normal file
View File

@ -0,0 +1,389 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="all"
height="390"
label="Water"
layout="topleft"
left="0"
name="panel_fs_settings_water"
top="0">
<panel
name="P_Wave_Fog"
label="Fog"
follows="left|top"
layout="topleft"
top_pad="0"
left="0"
width="280"
height="65"
border_visible="true"
background_visible="true">
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="40"
label_height="0"
layout="topleft"
left="20"
name="water_fog_color"
top_pad="5"
width="90"/>
<texture_picker
height="60"
layout="topleft"
left_pad="60"
name="water_normal_map"
top_delta="0"
width="40"/>
<text
follows="top|left"
font="SansSerifSmall"
layout="topleft"
left="20"
name="water_fog_label"
top_pad="-16"
width="110"
tool_tip="Water Fog Color - This changes the color of the volume tint of the water, essentially defining the color of the water itself. If your water has no fog, it will appear crystal clear and colorless."
word_wrap="true">
Water Fog Color
</text>
<text
follows="left|top|right"
font="SansSerifSmall"
layout="topleft"
left_pad="30"
name="normal_map_label"
top_delta="0"
tool_tip="Normal Map - Image used for determining reflections and refractions. Any texture may be used for this setting- but true normal maps work best. Try snake skin, tiles, or any other normal map for some wacky effects!"
width="100">
Normal Map
</text>
</panel>
<panel
name="P_Wave_Fog"
label="Fog"
follows="left|top"
layout="topleft"
top_pad="0"
left="0"
width="280"
height="80"
border_visible="true"
background_visible="true">
<text
name="density_exponent_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="115">
Density Exponent:
</text>
<slider
decimal_digits="1"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
min_val="-10"
max_val="10"
name="water_fog_density"
left_pad="0"
width="155"
can_edit_text="true"/>
<text
name="underwater_modifier_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="115">
Underwater Modifier:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0.0"
max_val="20.0"
name="water_underwater_mod"
width="155"
can_edit_text="true"/>
<text
name="FresnelScaleText"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="115">
Fresel Scale:
</text>
<slider
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0.7"
layout="topleft"
name="water_fresnel_scale"
left_pad="0"
width="155"
can_edit_text="true"/>
<text
name="FresnelOffsetText"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="115">
Fresnel Offset:
</text>
<slider
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
height="16"
layout="topleft"
left_pad="0"
name="water_fresnel_offset"
width="155"
can_edit_text="true"/>
</panel>
<panel
name="P_Water_Wave"
follows="left|top"
label="Wave"
layout="topleft"
top_pad="0"
left="0"
width="280"
height="180"
border_visible="true"
background_visible="true">
<text
name="large_wave_speed_label"
follows="left|top"
height="16"
width="130"
layout="topleft"
top_pad="5"
left="5">
Large Wave Speed
</text>
<text
name="small_wave_speed_label"
follows="left|top"
height="16"
layout="topleft"
top_delta="0"
left_pad="10">
Small Wave Speed
</text>
<xy_vector
follows="top|left"
name="water_wave1_xy"
width="130"
height="75"
visible="true"
left="5"
top_pad="0"
min_val_x="-20"
max_val_x="20"
increment_x="0.01f"
min_val_y="-20"
max_val_y="20"
increment_y="0.01f"
arrow_color="white"/>
<xy_vector
follows="top|left"
name="water_wave2_xy"
width="130"
height="75"
visible="true"
left_pad="10"
top_delta="0"
min_val_x="-20"
max_val_x="20"
min_val_y="-20"
max_val_y="20"
increment_x="0.01f"
increment_y="0.01f"
arrow_color="white"/>
<text
name="reflection_wavelet_scale_label"
follows="left|top|right"
height="16"
layout="topleft"
left="5"
top_pad="5"
width="215">
Reflection Wavelet Scale
</text>
<slider
decimal_digits="1"
follows="left|top"
increment="0.01"
height="16"
initial_value="0.7"
layout="topleft"
label="X:"
left="5"
max_val="10"
name="water_normal_scale_x"
top_pad="0"
width="270"
can_edit_text="true"/>
<slider
decimal_digits="1"
follows="left|top"
increment="0.01"
initial_value="0.7"
height="16"
layout="topleft"
left="5"
max_val="10"
name="water_normal_scale_y"
top_pad="5"
label="Y:"
width="270"
can_edit_text="true"/>
<slider
decimal_digits="1"
follows="left|top"
increment="0.01"
initial_value="0.7"
height="16"
layout="topleft"
left="5"
max_val="10"
name="water_normal_scale_z"
top_pad="5"
label="Z:"
width="270"
can_edit_text="true"/>
</panel>
<panel
name="P_Water_Reflection"
label="Refraction"
follows="left|top"
layout="topleft"
top_pad="0"
left="0"
width="280"
height="60"
border_visible="true"
background_visible="true">
<text
name="refraction_scale_above_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="155">
Refract Above Scale (Above):
</text>
<slider
control_name="water_scale_above"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.1"
height="16"
layout="topleft"
min_val="0"
max_val="3"
name="water_scale_above"
left_pad="0"
width="115"
can_edit_text="true" />
<text
name="refraction_scale_below_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="155">
Refract Scale (Below):
</text>
<slider
control_name="water_scale_below"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0"
layout="topleft"
left_pad="0"
min_val="0"
max_val="3"
name="water_scale_below"
width="115"
can_edit_text="true"/>
<text
name="blur_multiplier_label"
follows="left|top"
height="15"
layout="topleft"
left="5"
width="155">
Blur Multiplier:
</text>
<slider
control_name="water_blur_multip"
follows="left|top"
height="16"
increment="0.001"
initial_value="0"
layout="topleft"
min_val="-0.5"
max_val="0.5"
name="water_blur_multip"
left_pad="0"
width="115"
can_edit_text="true"/>
</panel>
</panel>