diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-10-11 16:21:01 +0300 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-10-11 16:21:01 +0300 |
| commit | a47896f4b917340fe6e27fd0687275c38dbad401 (patch) | |
| tree | e0ec1292a8e19206cb42741d1054516ea09cd09f /indra/media_plugins/quicktime/media_plugin_quicktime.cpp | |
| parent | 6e6f2c8f5bf7bb3326140b17e23471283fff75b1 (diff) | |
| parent | f5fcf54cd9e1356e33a629eaaf1602319e5da8df (diff) | |
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/media_plugins/quicktime/media_plugin_quicktime.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 7ef5a0fe44..b43598e4a5 100644..100755 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -837,9 +837,7 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) else if(message_name == "cleanup") { // TODO: clean up here - LLPluginMessage message("base", "goodbye"); - sendMessage(message); - } + } else if(message_name == "shm_added") { SharedSegmentInfo info; @@ -921,6 +919,9 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) #endif message.setValueS32("depth", mDepth); message.setValueU32("internalformat", GL_RGB); + + // note this apparently only has an effect when media is opened in 2D browser. + // see https://jira.secondlife.com/browse/BUG-18252 - media flipped in 2D so flipping it back. message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left. message.setValueBoolean("allow_downsample", true); sendMessage(message); |