diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-06-29 16:44:25 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-06-29 16:44:25 +0300 |
| commit | c2320fa0d0c9d006098d0b3830b3f40ae560768d (patch) | |
| tree | 5bda44dff6ac416797a67b4187d1392cc8314580 | |
| parent | 9ce396442f5e958cc3f01327812f4fbc08e4e952 (diff) | |
MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to region sky
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f1bafba32c..b118439f26 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1267,6 +1267,7 @@ Sovereign Engineer MAINT-6107 STORM-2107 MAINT-6218 + MAINT-2141 SpacedOut Frye VWR-34 VWR-45 diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 066cb9a0ac..482a2a61e2 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -288,14 +288,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) { // set up the iterators - // keep cloud positions and coverage the same - /// TODO masking will do this later - F32 cloudPos1X = (F32) mParamValues["cloud_pos_density1"][0].asReal(); - F32 cloudPos1Y = (F32) mParamValues["cloud_pos_density1"][1].asReal(); - F32 cloudPos2X = (F32) mParamValues["cloud_pos_density2"][0].asReal(); - F32 cloudPos2Y = (F32) mParamValues["cloud_pos_density2"][1].asReal(); - F32 cloudCover = (F32) mParamValues["cloud_shadow"][0].asReal(); - LLSD srcVal; LLSD destVal; @@ -379,15 +371,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) setSunAngle((1 - weight) * srcSunAngle + weight * destSunAngle); setEastAngle((1 - weight) * srcEastAngle + weight * destEastAngle); - - // now setup the sun properly - - // reset those cloud positions - mParamValues["cloud_pos_density1"][0] = cloudPos1X; - mParamValues["cloud_pos_density1"][1] = cloudPos1Y; - mParamValues["cloud_pos_density2"][0] = cloudPos2X; - mParamValues["cloud_pos_density2"][1] = cloudPos2Y; - mParamValues["cloud_shadow"][0] = cloudCover; } void LLWLParamSet::updateCloudScrolling(void) |