summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorThomas Nelson <rider@lindenlab.com>2017-10-17 13:38:39 -0700
committerThomas Nelson <rider@lindenlab.com>2017-10-17 13:38:39 -0700
commit5754493cdcfeac76d0576abc19bdf5a03717780d (patch)
treee6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /indra/media_plugins
parentcc22ffc6d799544e8f2a9dfed6813081d908c88d (diff)
parent9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff)
Merged lindenlab/viewer64 into default
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 74a0febe3c..f3d7762a08 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -388,6 +388,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
}
else if (message_name == "cleanup")
{
+ mVolumeCatcher.setVolume(0);
mCEFLib->requestExit();
}
else if (message_name == "shm_added")