diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/lltoolindividual.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-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 'linden/indra/newview/lltoolindividual.cpp')
-rw-r--r-- | linden/indra/newview/lltoolindividual.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolindividual.cpp b/linden/indra/newview/lltoolindividual.cpp index d7f7b12..219858d 100644 --- a/linden/indra/newview/lltoolindividual.cpp +++ b/linden/indra/newview/lltoolindividual.cpp | |||
@@ -61,7 +61,7 @@ | |||
61 | 61 | ||
62 | // Default constructor | 62 | // Default constructor |
63 | LLToolIndividual::LLToolIndividual() | 63 | LLToolIndividual::LLToolIndividual() |
64 | : LLTool("Individual") | 64 | : LLTool(std::string("Individual")) |
65 | { | 65 | { |
66 | } | 66 | } |
67 | 67 | ||
@@ -72,13 +72,13 @@ LLToolIndividual::~LLToolIndividual() | |||
72 | 72 | ||
73 | BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask) | 73 | BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask) |
74 | { | 74 | { |
75 | gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback); | 75 | gViewerWindow->pickAsync(x, y, mask, pickCallback); |
76 | return TRUE; | 76 | return TRUE; |
77 | } | 77 | } |
78 | 78 | ||
79 | void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask) | 79 | void LLToolIndividual::pickCallback(const LLPickInfo& pick_info) |
80 | { | 80 | { |
81 | LLViewerObject* obj = gViewerWindow->lastObjectHit(); | 81 | LLViewerObject* obj = pick_info.getObject(); |
82 | LLSelectMgr::getInstance()->deselectAll(); | 82 | LLSelectMgr::getInstance()->deselectAll(); |
83 | if(obj) | 83 | if(obj) |
84 | { | 84 | { |