summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-04-20 18:14:29 +0100
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-04-20 18:14:29 +0100
commit0d7fa932d579f3fb6140658db7efb01fcd8f5ceb (patch)
tree09ce964ef40613fc27976ca5c23759e9d1ff2764 /indra/llappearance
parent528ccdc97fae50f30b7606b8942ca953deec7c8a (diff)
Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch). Put in nSight debug support.
Diffstat (limited to 'indra/llappearance')
-rw-r--r--indra/llappearance/lltexlayer.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 3dbab22de1..47666deb76 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -1577,8 +1577,13 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
}
alpha_data = new U8[width * height];
mAlphaCache[cache_index] = alpha_data;
+
+ // nSight doesn't support use of glReadPixels
+ if (!LLRender::sNsightDebugSupport)
+ {
glReadPixels(x, y, width, height, GL_ALPHA, GL_UNSIGNED_BYTE, alpha_data);
}
+ }
getTexLayerSet()->getAvatarAppearance()->dirtyMesh();