diff options
author | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
---|---|---|
committer | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
commit | 0fdbe7e34df55ac92302b4af38c42d03454d3bc1 (patch) | |
tree | 038c6087299c9096ac7c6606ec45a8339eb0fd72 /indra/llappearance/lltexlayer.cpp | |
parent | 3bf89821d9c9777a0f24d89280bd7a7011a7a3df (diff) | |
parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) |
Merge
Diffstat (limited to 'indra/llappearance/lltexlayer.cpp')
-rw-r--r-- | indra/llappearance/lltexlayer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 2cf86bb4fe..186986bf9c 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(); |