From 1be15b3d3a3cb73cf244ea108839054872a27344 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Fri, 30 Sep 2016 15:20:37 -0700 Subject: Log volume control values for debugging --- indra/llplugin/llpluginclassmedia.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llplugin') diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 3d173d0459..5469ec0f5c 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1456,6 +1456,8 @@ void LLPluginClassMedia::setVolume(float volume) LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME, "set_volume"); + LL_INFOS() << "@@@@@@@@@@ volume is " << volume << LL_ENDL; + message.setValueReal("volume", volume); sendMessage(message); -- cgit v1.2.3 From 56953b146aa9d4367b6cf5e9e604ad278258418e Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 5 Oct 2016 13:15:25 -0700 Subject: Fix MAINT-6730 Media audio does not play when Media volume slider is set to max --- indra/llplugin/llpluginclassmedia.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llplugin') diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 5469ec0f5c..d672650658 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -116,7 +116,7 @@ void LLPluginClassMedia::reset() mMediaHeight = 0; mDirtyRect = LLRect::null; mAutoScaleMedia = false; - mRequestedVolume = 1.0f; + mRequestedVolume = 0.0f; mPriority = PRIORITY_NORMAL; mLowPrioritySizeLimit = LOW_PRIORITY_TEXTURE_SIZE_DEFAULT; mAllowDownsample = false; @@ -1456,8 +1456,6 @@ void LLPluginClassMedia::setVolume(float volume) LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME, "set_volume"); - LL_INFOS() << "@@@@@@@@@@ volume is " << volume << LL_ENDL; - message.setValueReal("volume", volume); sendMessage(message); -- cgit v1.2.3