diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-06-12 10:08:27 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-06-12 10:08:27 -0500 |
| commit | c96a00f12f868b9260f517a6a8552bce0b564099 (patch) | |
| tree | 003a51f242d3ae3f945550a9a2fd1ad9dd6df4e9 /indra | |
| parent | 8359c618fca10f4920c4f2572863b2426dbceabc (diff) | |
SL-19856 Adjust water fog density range. Incidental decruft.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_water.xml | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index d732032a6c..348848b29a 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -230,7 +230,7 @@ LLSettingsWater::validation_list_t LLSettingsWater::validationList() llsd::array(0.0f, 0.0f, 0.0f, 1.0f), llsd::array(1.0f, 1.0f, 1.0f, 1.0f)))); validation.push_back(Validator(SETTING_FOG_DENSITY, true, LLSD::TypeReal, - boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(-10.0f, 10.0f)))); + boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(0.001f, 100.0f)))); validation.push_back(Validator(SETTING_FOG_MOD, true, LLSD::TypeReal, boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(0.0f, 20.0f)))); validation.push_back(Validator(SETTING_FRESNEL_OFFSET, true, LLSD::TypeReal, diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 6321dbc085..258cc1c7b2 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -1023,13 +1023,6 @@ LLSettingsWater::parammapping_t LLSettingsVOWater::getParameterMap() const { static parammapping_t param_map; - if (param_map.empty()) - { - //LLSD water_defaults = LLSettingsWater::defaults(); - //param_map[SETTING_FOG_COLOR] = DefaultParam(LLShaderMgr::WATER_FOGCOLOR, water_defaults[SETTING_FOG_COLOR]); - // let this get set by LLSettingsVOWater::applySpecial so that it can properly reflect the underwater modifier - //param_map[SETTING_FOG_DENSITY] = DefaultParam(LLShaderMgr::WATER_FOGDENSITY, water_defaults[SETTING_FOG_DENSITY]); - } return param_map; } diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index 1aa42af3a8..f19629df26 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -72,8 +72,8 @@ initial_value="0" layout="top" left_delta="15" - min_val="-10" - max_val="10" + min_val="0.001" + max_val="100" name="water_fog_density" top_delta="5" width="150" |