summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAnchor <none@none>2019-07-10 00:46:17 -0700
committerAnchor <none@none>2019-07-10 00:46:17 -0700
commit72ed28efed821bccaaa977b74c741664058f1297 (patch)
tree526f3f9878e8ee6945740d28c4ba423069b96742 /indra
parent2fb897006c8f8527b5285ab36dd6c6482d79c104 (diff)
[SL-11548] - don't treat the local avatar bakes as alpha masks
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewertexlayer.cpp2
-rw-r--r--indra/newview/llwlparamset.cpp16
2 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index 66e5742911..7f7d190b92 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -58,6 +58,8 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner,
mNeedsUpdate(TRUE),
mNumLowresUpdates(0)
{
+ mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
+
LLViewerTexLayerSetBuffer::sGLByteCount += getSize();
mNeedsUpdateTimer.start();
}
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 066cb9a0ac..85e95f9325 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.