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

[CEF] Catch a missed change for dullahan update. OCDly fix an indentation.

Browse Source
This commit is contained in:
Router Gray
2020-02-26 23:24:36 -06:00
parent c72059e73f
commit 8f89127900
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llmediactrl.cpp
View File

@@ -207,7 +207,10 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
{ {
if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE; if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE;
if (mMediaSource && mMediaSource->hasMedia()) if (mMediaSource && mMediaSource->hasMedia())
mMediaSource->getMediaPlugin()->scrollEvent(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); {
convertInputCoords(x, y);
mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE));
}
return TRUE; return TRUE;
} }

2
indra/newview/llpanelprimmediacontrols.cpp
View File

@@ -566,7 +566,7 @@ void LLPanelPrimMediaControls::updateShape()
// media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE); // media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE);
break; break;
case SCROLL_NONE: case SCROLL_NONE:
default: default:
break; break;
} }
} }