diff options
author | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
commit | f61a5c4642db8af5d80eacc0ca7a2062bf08e4f0 (patch) | |
tree | e644e1db27f9ea9043d4adeeafc3da5ebdd8e211 /indra/media_plugins/example/media_plugin_example.cpp | |
parent | bc06a9acf91035903d497bdd66e9bb26859616be (diff) | |
parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) |
Merge viewer-release 6.3.6 into viewwer-eep repo
Diffstat (limited to 'indra/media_plugins/example/media_plugin_example.cpp')
-rw-r--r-- | indra/media_plugins/example/media_plugin_example.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp index c296a0413d..650685fb94 100644 --- a/indra/media_plugins/example/media_plugin_example.cpp +++ b/indra/media_plugins/example/media_plugin_example.cpp @@ -128,6 +128,10 @@ void mediaPluginExample::receiveMessage(const char* message_string) mDeleteMe = true; } + else if (message_name == "force_exit") + { + mDeleteMe = true; + } else if (message_name == "shm_added") { SharedSegmentInfo info; |