summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAnchor <none@none>2019-07-10 00:47:58 -0700
committerAnchor <none@none>2019-07-10 00:47:58 -0700
commit417a2d43f39b67d179d69a94c686b5938ed6b3ff (patch)
tree0c780cb15ea02f3eabd5dbfa3b53bf2bd04d979b /indra
parent72ed28efed821bccaaa977b74c741664058f1297 (diff)
[SL-11548] - checked in the commented code by mistake
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llwlparamset.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 85e95f9325..066cb9a0ac 100644
--- a/indra/newview/llwlparamset.cpp
+++ b/indra/newview/llwlparamset.cpp
@@ -337,14 +337,14 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
setStarBrightness((1 - weight) * (F32) src.getStarBrightness()
+ weight * (F32) dest.getStarBrightness());
- //llassert(src.getSunAngle() >= - F_PI &&
- // src.getSunAngle() <= 3 * F_PI);
- //llassert(dest.getSunAngle() >= - F_PI &&
- // dest.getSunAngle() <= 3 * F_PI);
- //llassert(src.getEastAngle() >= 0 &&
- // src.getEastAngle() <= 4 * F_PI);
- //llassert(dest.getEastAngle() >= 0 &&
- // dest.getEastAngle() <= 4 * F_PI);
+ llassert(src.getSunAngle() >= - F_PI &&
+ src.getSunAngle() <= 3 * F_PI);
+ llassert(dest.getSunAngle() >= - F_PI &&
+ dest.getSunAngle() <= 3 * F_PI);
+ llassert(src.getEastAngle() >= 0 &&
+ src.getEastAngle() <= 4 * F_PI);
+ llassert(dest.getEastAngle() >= 0 &&
+ dest.getEastAngle() <= 4 * F_PI);
// sun angle and east angle require some handling to make sure
// they go in circles. Yes quaternions would work better.