From 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 22 Jul 2008 20:55:02 +0000 Subject: svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation. --- indra/llwindow/llwindowmacosx.cpp | 5 ----- indra/llwindow/llwindowwin32.cpp | 4 ---- 2 files changed, 9 deletions(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index df3fb2e240..65f0a2b7e2 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1411,11 +1411,6 @@ BOOL LLWindowMacOSX::setCursorPosition(const LLCoordWindow position) // Under certain circumstances, this will trigger us to decouple the cursor. adjustCursorDecouple(true); - // trigger mouse move callback - LLCoordGL gl_pos; - convertCoords(position, &gl_pos); - mCallbacks->handleMouseMove(this, gl_pos, (MASK)0); - return result; } diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 526a6769a0..4a81ddd1fd 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1387,10 +1387,6 @@ BOOL LLWindowWin32::setCursorPosition(const LLCoordWindow position) return FALSE; } - LLCoordGL gl_pos; - convertCoords(position, &gl_pos); - mCallbacks->handleMouseMove(this, gl_pos, (MASK)0); - return SetCursorPos(screen_pos.mX, screen_pos.mY); } -- cgit v1.2.3