diff options
author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
---|---|---|
committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
commit | f2948cb1eb8866716a84868cccbfafcd742c0771 (patch) | |
tree | 394df20f229f87428252c02d2402c511b9fa7aa8 /indra/newview/llviewerwindow.cpp | |
parent | 779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff) | |
parent | 4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff) |
Merge with viewer-chui
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 a6cd2c9ab7..0910b7536d 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2837,7 +2837,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); @@ -3022,7 +3021,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 ) |