diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2020-03-05 20:19:47 +0000 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2020-03-05 20:19:47 +0000 |
| commit | c1a3797b304f95e4ed025596d611bb2861d322b8 (patch) | |
| tree | 2f731a287263ab00ad377ecab1140affa4719155 /indra/newview/llviewertexture.cpp | |
| parent | 90ad38db065877be16371e7814a39618135a30ab (diff) | |
| parent | edb4373f7d2a32beb93a7f69ddcdf5e1bc0eb6a1 (diff) | |
Merged in fix for SL-9775
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index f5f9d0d3cc..a2cec9a613 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -3481,7 +3481,10 @@ BOOL LLViewerMediaTexture::findFaces() U32 end = tex->getNumFaces(ch); for(U32 i = 0; i < end; i++) { - mMediaFaceList.push_back((*face_list)[i]); + if ((*face_list)[i]->isMediaAllowed()) + { + mMediaFaceList.push_back((*face_list)[i]); + } } } } |