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/lltoolselect.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/lltoolselect.h')
| -rw-r--r-- | indra/newview/lltoolselect.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltoolselect.h b/indra/newview/lltoolselect.h index c3d10424b1..f6359863a8 100644 --- a/indra/newview/lltoolselect.h +++ b/indra/newview/lltoolselect.h @@ -35,6 +35,7 @@ #include "lltool.h" #include "v3math.h" #include "lluuid.h" +#include "llviewerwindow.h" // for LLPickInfo class LLObjectSelection; @@ -45,11 +46,10 @@ public: virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); virtual void stopEditing(); - static LLSafeHandle<LLObjectSelection> handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select); + static LLSafeHandle<LLObjectSelection> handleObjectSelection(const LLPickInfo& pick, BOOL ignore_group, BOOL temp_select, BOOL select_root = FALSE); virtual void onMouseCaptureLost(); virtual void handleDeselect(); @@ -57,6 +57,7 @@ public: protected: BOOL mIgnoreGroup; LLUUID mSelectObjectID; + LLPickInfo mPick; }; |