diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-02-23 17:55:44 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-02-23 17:55:44 -0600 |
| commit | fc0b238654091c6090d5d85ceda51fbc6cb71eaa (patch) | |
| tree | 1f12b135e73d088b4dd0606e6a80ba3895468c35 /indra/newview/llviewermedia.cpp | |
| parent | d9a68339d5aa18af349e347d6ed74bc01824cec7 (diff) | |
Fix for media textures failing to update (and eating lots of memory) on Mac/Intel
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index e442afe4b1..272da6367b 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2997,10 +2997,15 @@ void LLViewerMediaImpl::doMediaTexUpdate(LLViewerMediaTexture* media_tex, U8* da // copy just the subimage covered by the image raw to GL media_tex->setSubImage(data, data_width, data_height, x_pos, y_pos, width, height, tex_name); + if (sync) { media_tex->getGLTexture()->syncToMainThread(tex_name); } + else + { + media_tex->getGLTexture()->syncTexName(tex_name); + } // release the data pointer before freeing raw so LLImageRaw destructor doesn't // free memory at data pointer |