diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-12-13 02:21:48 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-12-13 02:21:48 +0200 |
| commit | b0265f97563efc5b6e95b9f14352878185c1be05 (patch) | |
| tree | c571caa58a448775d502bb122a26e67da6d60e5b /indra/media_plugins/libvlc | |
| parent | 5f86203f261b376ad74814e1e635dba077c7718b (diff) | |
| parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/media_plugins/libvlc')
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index 80702a1079..f7d35b33c2 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -495,6 +495,10 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string) { resetVLC(); } + else if (message_name == "force_exit") + { + mDeleteMe = true; + } else if (message_name == "shm_added") { SharedSegmentInfo info; |