summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolobjpicker.h
diff options
context:
space:
mode:
authorKarl Steifvater <qarl@lindenlab.com>2008-07-23 21:20:19 +0000
committerKarl Steifvater <qarl@lindenlab.com>2008-07-23 21:20:19 +0000
commit52562e2e664c70dcd476291820ac02b893e489b8 (patch)
tree5137f49f194a6a28f290385c38f689d77656b2e0 /indra/newview/lltoolobjpicker.h
parentbc39ad916e8f23ffae12184eee675aa7c1be2ca9 (diff)
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
Diffstat (limited to 'indra/newview/lltoolobjpicker.h')
-rw-r--r--indra/newview/lltoolobjpicker.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h
index 794d035a83..8d0c87c8ae 100644
--- a/indra/newview/lltoolobjpicker.h
+++ b/indra/newview/lltoolobjpicker.h
@@ -36,6 +36,8 @@
#include "v3math.h"
#include "lluuid.h"
+class LLPickInfo;
+
class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker>
{
public:
@@ -54,7 +56,7 @@ public:
LLUUID getObjectID() const { return mHitObjectID; }
- static void pickCallback(S32 x, S32 y, MASK mask);
+ static void pickCallback(const LLPickInfo& pick_info);
protected:
BOOL mPicked;