summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum <none@none>2009-10-30 12:53:13 -0700
committercallum <none@none>2009-10-30 12:53:13 -0700
commit5702da187ddda62fd19e40c94ed35665c6d6101e (patch)
tree95d797f455c7919f78880a7cb73c74788e8ea0c2 /indra
parent71993b14d1bd95da9b851ac8b7079a4acdbd42ef (diff)
Implementation for DEV-41993
Mutes media on preview widget in media settings/general panel
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelmediasettingsgeneral.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
index 6a3617f008..a198499b47 100644
--- a/indra/newview/llpanelmediasettingsgeneral.cpp
+++ b/indra/newview/llpanelmediasettingsgeneral.cpp
@@ -134,6 +134,11 @@ void LLPanelMediaSettingsGeneral::draw()
LLPluginClassMedia* media_plugin = mPreviewMedia->getMediaPlugin();
if( media_plugin )
{
+ // turn off volume (if we can) for preview. Note: this really only
+ // works for QuickTime movies right now - no way to control the
+ // volume of a flash app embedded in a page for example
+ media_plugin->setVolume( 0 );
+
// some controls are only appropriate for time or browser type plugins
// so we selectively enable/disable them - need to do it in draw
// because the information from plugins arrives assynchronously