diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-26 11:32:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-26 11:32:31 -0400 |
| commit | e917620069ce20c30c1abb53c5ece847ee76ddba (patch) | |
| tree | 31e85be6bd0b0177ab56ae8dfeef1dfff15d19c5 /indra/newview/llviewerwindow.cpp | |
| parent | 70ae613209bdc03f7ff45075e673e225447ec7a5 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
merge changes for 3.5.0-beta5
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 836f9cfc5f..47891c4585 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2841,7 +2841,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); @@ -3026,7 +3025,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 ) |