diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-23 21:20:19 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-23 21:20:19 +0000 |
| commit | 52562e2e664c70dcd476291820ac02b893e489b8 (patch) | |
| tree | 5137f49f194a6a28f290385c38f689d77656b2e0 /indra/newview/lltoolpipette.h | |
| parent | bc39ad916e8f23ffae12184eee675aa7c1be2ca9 (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/lltoolpipette.h')
| -rw-r--r-- | indra/newview/lltoolpipette.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h index b88a6eebc8..5d5b27f964 100644 --- a/indra/newview/lltoolpipette.h +++ b/indra/newview/lltoolpipette.h @@ -41,6 +41,7 @@ #include "lltextureentry.h" class LLViewerObject; +class LLPickInfo; class LLToolPipette : public LLTool, public LLSingleton<LLToolPipette> @@ -58,7 +59,7 @@ public: void setSelectCallback(select_callback callback, void* user_data); void setResult(BOOL success, const std::string& msg); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); protected: LLTextureEntry mTextureEntry; |