From 52562e2e664c70dcd476291820ac02b893e489b8 Mon Sep 17 00:00:00 2001
From: Karl Steifvater <qarl@lindenlab.com>
Date: Wed, 23 Jul 2008 21:20:19 +0000
Subject: svn merge -r92720:92721
 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge

QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
---
 indra/llwindow/llwindowmacosx.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 65f0a2b7e2..df3fb2e240 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1411,6 +1411,11 @@ 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;
 }
 
-- 
cgit v1.2.3