From df4f20d4f51e41355e876f734527b4245543415c Mon Sep 17 00:00:00 2001 From: Karl Steifvater Date: Tue, 22 Jul 2008 20:12:37 +0000 Subject: merge uv-picking branch. svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4 --- indra/newview/lltoolindividual.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/lltoolindividual.h') diff --git a/indra/newview/lltoolindividual.h b/indra/newview/lltoolindividual.h index 48a2365363..913e4ff2b8 100644 --- a/indra/newview/lltoolindividual.h +++ b/indra/newview/lltoolindividual.h @@ -34,6 +34,8 @@ #include "lltool.h" +class LLPickInfo; + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class lltoolindividual // @@ -52,7 +54,7 @@ public: //virtual void handleDeselect(); //virtual void render(); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); protected: -- cgit v1.2.3