diff options
| author | simon <none@none> | 2013-03-22 14:17:26 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-22 14:17:26 -0700 |
| commit | 1d8e3997c8ced25524f146aeb6cc683e5767a5f7 (patch) | |
| tree | 888cc32ac788bcb10dc5df4f0e0124514f4474ef /indra/newview/llviewerwindow.cpp | |
| parent | 395f8baf03622f3a36b03b8e31679e3b594b1757 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
Pull and merge latest viewer-beta
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 3bd94413fe..1fba1d9282 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2831,7 +2831,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); @@ -3016,7 +3015,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 ) |