livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And another merge with https://bitbucket.org/lindenlab/viewer-vlc/

master
Nicky 2016-10-05 22:34:46 +02:00
parent a5fa0eb223 56953b146a
commit 1bbbc85e46
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llplugin/llpluginclassmedia.cpp
View File

@ -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;
@ -1468,8 +1468,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);