diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-17 19:04:32 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-17 19:04:32 +0000 |
| commit | 027bc36259ebd27fe99b35feb4ec3c4680fb0bcf (patch) | |
| tree | d2de6d723c3028c43057a7921508c2dfb8203b26 /indra/llinventory | |
| parent | 53a93d3e73892f633b1d79de359924d733489bdb (diff) | |
| parent | 9581a197aceba7647ab9153513089570f11c4f9a (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #92)
SL-1491 and SL-1873
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 56449c0598..399692d80b 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -534,7 +534,7 @@ LLSettingsSky::validation_list_t LLSettingsSky::validationList() boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.25f)(20.0f))), LLSD::Real(1.0))); validation.push_back(Validator(SETTING_MOON_TEXTUREID, false, LLSD::TypeUUID)); validation.push_back(Validator(SETTING_STAR_BRIGHTNESS, true, LLSD::TypeReal, - boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(512.0f))))); + boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(500.0f))))); validation.push_back(Validator(SETTING_SUNLIGHT_COLOR, true, LLSD::TypeArray, boost::bind(&Validator::verifyVectorMinMax, _1, LLSD(LLSDArray(0.0f)(0.0f)(0.0f)("*")), @@ -784,7 +784,7 @@ LLSD LLSettingsSky::translateLegacySettings(const LLSD& legacy) } if (legacy.has(SETTING_STAR_BRIGHTNESS)) { - newsettings[SETTING_STAR_BRIGHTNESS] = LLSD::Real(legacy[SETTING_STAR_BRIGHTNESS].asReal()) * 256.0f; + newsettings[SETTING_STAR_BRIGHTNESS] = LLSD::Real(legacy[SETTING_STAR_BRIGHTNESS].asReal() * 250.0f); } if (legacy.has(SETTING_SUNLIGHT_COLOR)) { |