diff options
| author | Runitai Linden <davep@lindenlab.com> | 2020-03-06 09:11:44 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2020-03-06 09:11:44 -0600 |
| commit | ecf8c6f520b02077d5ec575bae83022f59bf73e5 (patch) | |
| tree | 677e95f130a80084815f1dd0ccbda1ad0638397b /indra/newview/llviewertexture.cpp | |
| parent | 7c7d71269f5b47397d14bbe44e341e4ac1d96889 (diff) | |
| parent | c1a3797b304f95e4ed025596d611bb2861d322b8 (diff) | |
Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into davep/BUG-228263
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]); + } } } } |