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/lltoolindividual.cpp | |
| 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/lltoolindividual.cpp')
| -rw-r--r-- | indra/newview/lltoolindividual.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp index 3fa96cd84a..0e0524daa6 100644 --- a/indra/newview/lltoolindividual.cpp +++ b/indra/newview/lltoolindividual.cpp @@ -72,13 +72,13 @@ LLToolIndividual::~LLToolIndividual() BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask) { - gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback); + gViewerWindow->pickAsync(x, y, mask, pickCallback); return TRUE; } -void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask) +void LLToolIndividual::pickCallback(const LLPickInfo& pick_info) { - LLViewerObject* obj = gViewerWindow->lastObjectHit(); + LLViewerObject* obj = pick_info.getObject(); LLSelectMgr::getInstance()->deselectAll(); if(obj) { |