aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolselect.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/lltoolselect.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lltoolselect.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/lltoolselect.h b/linden/indra/newview/lltoolselect.h
index a23729f..d3b86f5 100644
--- a/linden/indra/newview/lltoolselect.h
+++ b/linden/indra/newview/lltoolselect.h
@@ -35,6 +35,7 @@
35#include "lltool.h" 35#include "lltool.h"
36#include "v3math.h" 36#include "v3math.h"
37#include "lluuid.h" 37#include "lluuid.h"
38#include "llviewerwindow.h" // for LLPickInfo
38 39
39class LLObjectSelection; 40class LLObjectSelection;
40 41
@@ -45,11 +46,10 @@ public:
45 46
46 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 47 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
47 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); 48 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
48 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
49 49
50 virtual void stopEditing(); 50 virtual void stopEditing();
51 51
52 static LLSafeHandle<LLObjectSelection> handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select); 52 static LLSafeHandle<LLObjectSelection> handleObjectSelection(const LLPickInfo& pick, BOOL ignore_group, BOOL temp_select, BOOL select_root = FALSE);
53 53
54 virtual void onMouseCaptureLost(); 54 virtual void onMouseCaptureLost();
55 virtual void handleDeselect(); 55 virtual void handleDeselect();
@@ -57,6 +57,7 @@ public:
57protected: 57protected:
58 BOOL mIgnoreGroup; 58 BOOL mIgnoreGroup;
59 LLUUID mSelectObjectID; 59 LLUUID mSelectObjectID;
60 LLPickInfo mPick;
60}; 61};
61 62
62 63