Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update VLC and Dullahan. Update vcredist deployment. Thanks Alchemy!

Browse Source
This commit is contained in:
Liru Færs
2020-02-25 03:21:27 -05:00
parent 0c3e144547
commit 2afd2c500b
14 changed files with 82 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermedia.cpp
View File

@@ -2347,7 +2347,7 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
}
//////////////////////////////////////////////////////////////////////////////////////////
void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask)
void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask)
{
LLPluginClassMedia* mMediaSource = getMediaPlugin();
scaleMouse(&x, &y);
@@ -2355,7 +2355,7 @@ void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask)
mLastMouseY = y;
if (mMediaSource)
{
mMediaSource->scrollEvent(x, y, mask);
mMediaSource->scrollEvent(x, y, scroll_x, scroll_y, mask);
}
}