diff options
author | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
---|---|---|
committer | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
commit | 14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78 (patch) | |
tree | 60f4de9fcd1b22b8dd504218a870e8abea599a81 /indra/newview/llviewerwindow.cpp | |
parent | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (diff) | |
parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) |
Merged lindenlab/viewer-development into default
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-x | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e44a2cc4df..4afd90b44c 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2827,7 +2827,6 @@ void LLViewerWindow::updateUI() BOOL handled = FALSE; - BOOL handled_by_top_ctrl = FALSE; LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl(); LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture(); LLView* captor_view = dynamic_cast<LLView*>(mouse_captor); @@ -3012,7 +3011,6 @@ void LLViewerWindow::updateUI() S32 local_x, local_y; top_ctrl->screenPointToLocal( x, y, &local_x, &local_y ); handled = top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleHover(local_x, local_y, mask); - handled_by_top_ctrl = TRUE; } if ( !handled ) |