diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-03 00:25:07 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-03 00:25:07 +0300 |
| commit | e8194e6aba4394930868f9b883192f2ec0b4e710 (patch) | |
| tree | e1e4eca833624bf307897f69b63d6462e9de1cf5 /indra/newview/llwlparamset.cpp | |
| parent | 1aedd96cd1d22520adea5e414a689231c4b95b22 (diff) | |
SL-11856 Backed out SL-11012
changeset: 0d43d9754b79
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index a6fef718a2..986f167d8d 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -284,11 +284,6 @@ void LLWLParamSet::setEastAngle(float val) mParamValues["east_angle"] = val; } -void LLWLParamSet::setAmbient(const LLVector4& val) -{ - set("ambient", val); -} - void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) { // set up the iterators @@ -389,19 +384,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight) setSunAngle((1 - weight) * srcSunAngle + weight * destSunAngle); setEastAngle((1 - weight) * srcEastAngle + weight * destEastAngle); - - // ambient - - LLVector4 srcAmbient = src.getAmbient(); - LLVector4 destAmbient = dest.getAmbient(); - LLVector4 rsltAmbient; - - for (int i = 0; i < LENGTHOFVECTOR4; ++i) - { - rsltAmbient.mV[i] = srcAmbient.mV[i] + ((destAmbient.mV[i] - srcAmbient.mV[i]) * weight); - } - - setAmbient(rsltAmbient); // now setup the sun properly |