diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-21 10:57:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-21 10:57:38 -0400 |
| commit | 50f199e45d0524b59fc9246a3160c5676c8d3942 (patch) | |
| tree | e091467d64f4334459b5ca67239ed23d4059392a /indra/newview/llviewerwindow.cpp | |
| parent | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff) | |
| parent | 43d7c80e8e2cd1cfe4e6c4214b4a4df9341d310b (diff) | |
merge changes for 3.5.0-beta4
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 ) |