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/lltoolface.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/lltoolface.cpp')
| -rw-r--r-- | indra/newview/lltoolface.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index 3248913182..138fc99606 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -82,17 +82,16 @@ BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) BOOL LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask) { - gPickFaces = TRUE; - gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback); + gViewerWindow->pickAsync(x, y, mask, pickCallback); return TRUE; } -void LLToolFace::pickCallback(S32 x, S32 y, MASK mask) +void LLToolFace::pickCallback(const LLPickInfo& pick_info) { - LLViewerObject* hit_obj = gViewerWindow->lastObjectHit(); + LLViewerObject* hit_obj = pick_info.getObject(); if (hit_obj) { - S32 hit_face = gLastHitObjectFace; + S32 hit_face = pick_info.mObjectFace; if (hit_obj->isAvatar()) { @@ -102,7 +101,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask) // ...clicked on a world object, try to pick the appropriate face - if (mask & MASK_SHIFT) + if (pick_info.mKeyMask & MASK_SHIFT) { // If object not selected, need to inform sim if ( !hit_obj->isSelected() ) @@ -133,7 +132,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask) } else { - if (!(mask == MASK_SHIFT)) + if (!(pick_info.mKeyMask == MASK_SHIFT)) { LLSelectMgr::getInstance()->deselectAll(); } |