From ce0a5fe14590b8d675b885fccd5f79d7ea17a302 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Tue, 21 Aug 2007 22:17:53 +0000 Subject: EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release --- indra/newview/lltoolgrab.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltoolgrab.cpp') diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index 6a65942785..05355a707a 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -783,9 +783,10 @@ void LLToolGrab::onMouseCaptureLost() LLVector3 grab_point_agent = mGrabObject->getRenderPosition(); LLCoordGL gl_point; - gCamera->projectPosAgentToScreen(grab_point_agent, gl_point); - - LLUI::setCursorPositionScreen(gl_point.mX, gl_point.mY); + if (gCamera->projectPosAgentToScreen(grab_point_agent, gl_point)) + { + LLUI::setCursorPositionScreen(gl_point.mX, gl_point.mY); + } } else { -- cgit v1.3