diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
| commit | 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/newview/lltooldraganddrop.h | |
| parent | df4f20d4f51e41355e876f734527b4245543415c (diff) | |
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
Diffstat (limited to 'indra/newview/lltooldraganddrop.h')
| -rw-r--r-- | indra/newview/lltooldraganddrop.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index 8e2788a173..8f6d1713fa 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -45,7 +45,6 @@ class LLToolDragAndDrop; class LLViewerRegion; class LLVOAvatar; -class LLPickInfo; class LLToolDragAndDrop : public LLTool, public LLSingleton<LLToolDragAndDrop> { @@ -107,7 +106,7 @@ protected: EAcceptance* acceptance); void dragOrDrop3D(S32 x, S32 y, MASK mask, BOOL drop, EAcceptance* acceptance); - static void pickCallback(const LLPickInfo& pick_info); + static void pickCallback(S32 x, S32 y, MASK mask); protected: |