diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
| commit | 73caee4208a4e05f66583de099502012fd8415ea (patch) | |
| tree | ff9fa1b7b010e71fb62f26a32c912b5e266f3b23 /indra/llui/llview.cpp | |
| parent | 1db494f58ad378b8028c1f071196be82af5fe964 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index e3b61dfaa2..0ba028e1c8 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -947,16 +947,11 @@ BOOL LLView::handleDoubleClick(S32 x, S32 y, MASK mask) BOOL LLView::handleScrollWheel(S32 x, S32 y, S32 clicks) { - BOOL handled = FALSE; if( getVisible() && getEnabled() ) { - handled = childrenHandleScrollWheel( x, y, clicks ) != NULL; - if( !handled && blockMouseEvent(x, y) ) - { - handled = TRUE; - } + return childrenHandleScrollWheel( x, y, clicks ) != NULL; } - return handled; + return FALSE; } BOOL LLView::handleRightMouseDown(S32 x, S32 y, MASK mask) |