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/lltooldraganddrop.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/lltooldraganddrop.h')
| -rw-r--r-- | indra/newview/lltooldraganddrop.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index 8f6d1713fa..8e2788a173 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -45,6 +45,7 @@ class LLToolDragAndDrop; class LLViewerRegion; class LLVOAvatar; +class LLPickInfo; class LLToolDragAndDrop : public LLTool, public LLSingleton<LLToolDragAndDrop> { @@ -106,7 +107,7 @@ protected: EAcceptance* acceptance); void dragOrDrop3D(S32 x, S32 y, MASK mask, BOOL drop, EAcceptance* acceptance); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); protected: |