diff options
| author | callum_linden <none@none> | 2018-01-08 14:51:32 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-01-08 14:51:32 -0800 |
| commit | 8f214ad00b4444e9ed876f92da56bda15310a374 (patch) | |
| tree | 33e64a6c59b4371a6ee7edf036d7c18c7ca307ac | |
| parent | 5989dd1673768660587552fbab0d7fa2851359c2 (diff) | |
Fix for MAINT-7886 Resizing internal web browser window causes video playback to stop
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 1dfa9c1d0b..b8901e4d5c 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -167,6 +167,10 @@ void MediaPluginCEF::onPageChangedCallback(const unsigned char* pixels, int x, i { memcpy(mPixels, pixels, mWidth * mHeight * mDepth); } + else + { + mCEFLib->setSize(mWidth, mHeight); + } setDirty(0, 0, mWidth, mHeight); } } @@ -412,7 +416,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER] = LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER_VERSION; message.setValueLLSD("versions", versions); - std::string plugin_version = "CEF plugin 1.2.0"; + std::string plugin_version = "CEF plugin 1.1.3"; message.setValue("plugin_version", plugin_version); sendMessage(message); } @@ -559,11 +563,11 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mTextureWidth = texture_width; mTextureHeight = texture_height; + + mCEFLib->setSize(mWidth, mHeight); }; }; - mCEFLib->setSize(mWidth, mHeight); - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response"); message.setValue("name", name); message.setValueS32("width", width); |