diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-02 18:08:04 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-02 18:08:04 +0200 |
| commit | 3dc509bec08d39d44c8a2c1e81d31922a6c11239 (patch) | |
| tree | 171e8b91df89fc581eb7189c2ed45a450aadef41 /indra/newview/llpanelmediasettingsgeneral.cpp | |
| parent | b06bc5944c23ccadfb6c99c65f4d498acc5e2a2d (diff) | |
| parent | 265805a1b02555c01f9f2ac42000dbc731ab31c6 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.cpp')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.cpp | 5 |
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
|