diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-07 16:10:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-07 16:10:36 -0700 |
| commit | b239522fea591a1c53615875dd158e479cd6ccf2 (patch) | |
| tree | 537b6b430936946f4091f4763e67ea59326d5b93 /indra/llinventory | |
| parent | 114e358aae80e9e3ca70de093d51e4700c46df37 (diff) | |
| parent | 1f69a685eb7d403b8ad5b2ebc24978151da49910 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 8539f1fe0a..bc7f4f2b5a 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -155,7 +155,7 @@ LLSettingsSky::validation_list_t legacyHazeValidationList() legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_HAZE_HORIZON, false, LLSD::TypeReal, boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(1.0f))))); legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_DENSITY_MULTIPLIER, false, LLSD::TypeReal, - boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(0.0009f))))); + boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0001f)(0.9f))))); legacyHazeValidation.push_back(LLSettingsBase::Validator(LLSettingsSky::SETTING_DISTANCE_MULTIPLIER, false, LLSD::TypeReal, boost::bind(&LLSettingsBase::Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(100.0f))))); } @@ -923,11 +923,12 @@ F32 LLSettingsSky::getHazeHorizon() const F32 LLSettingsSky::getDensityMultiplier() const { + F32 density_multiplier = 0.0001f; if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_DENSITY_MULTIPLIER)) { - return mSettings[SETTING_LEGACY_HAZE][SETTING_DENSITY_MULTIPLIER].asReal(); + density_multiplier = mSettings[SETTING_LEGACY_HAZE][SETTING_DENSITY_MULTIPLIER].asReal(); } - return 0.0001f; + return density_multiplier; } F32 LLSettingsSky::getDistanceMultiplier() const |