diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
| commit | df4f20d4f51e41355e876f734527b4245543415c (patch) | |
| tree | 36aaf66ddb96b27fb9701764153cd7d17add275a /indra/newview/lltoolfocus.h | |
| parent | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (diff) | |
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
Diffstat (limited to 'indra/newview/lltoolfocus.h')
| -rw-r--r-- | indra/newview/lltoolfocus.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h index 2ed456b188..c8c748a1b0 100644 --- a/indra/newview/lltoolfocus.h +++ b/indra/newview/lltoolfocus.h @@ -34,6 +34,8 @@ #include "lltool.h" +class LLPickInfo; + class LLToolCamera : public LLTool, public LLSingleton<LLToolCamera> { @@ -52,7 +54,7 @@ public: virtual LLTool* getOverrideTool(MASK mask) { return NULL; } - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); BOOL mouseSteerMode() { return mMouseSteering; } protected: |