diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llwindow/llwindowmacosx-objc.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 77024d3a9c..f9a7a098cb 100644 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -37,7 +37,7 @@ typedef std::vector<std::pair<int, bool> > segment_t; typedef std::vector<int> segment_lengths; -typedef std::vector<int> segment_standouts; +typedef std::vector<bool> segment_standouts; struct attributedStringInfo { segment_lengths seg_lengths; diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 53d8d3076c..6a4b3dfb5b 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2345,7 +2345,7 @@ bool LLViewerMediaImpl::handleMouseUp(S32 x, S32 y, MASK mask) if(hasMouseCapture()) { // Release the mouse -- this will also send a mouseup to the media - gFocusMgr.setMouseCapture( false ); + gFocusMgr.setMouseCapture( nullptr ); } return true; |