diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
| commit | 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/newview/lltoolface.cpp | |
| parent | df4f20d4f51e41355e876f734527b4245543415c (diff) | |
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
Diffstat (limited to 'indra/newview/lltoolface.cpp')
| -rw-r--r-- | indra/newview/lltoolface.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index 138fc99606..3248913182 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -82,16 +82,17 @@ BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) BOOL LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask) { - gViewerWindow->pickAsync(x, y, mask, pickCallback); + gPickFaces = TRUE; + gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback); return TRUE; } -void LLToolFace::pickCallback(const LLPickInfo& pick_info) +void LLToolFace::pickCallback(S32 x, S32 y, MASK mask) { - LLViewerObject* hit_obj = pick_info.getObject(); + LLViewerObject* hit_obj = gViewerWindow->lastObjectHit(); if (hit_obj) { - S32 hit_face = pick_info.mObjectFace; + S32 hit_face = gLastHitObjectFace; if (hit_obj->isAvatar()) { @@ -101,7 +102,7 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info) // ...clicked on a world object, try to pick the appropriate face - if (pick_info.mKeyMask & MASK_SHIFT) + if (mask & MASK_SHIFT) { // If object not selected, need to inform sim if ( !hit_obj->isSelected() ) @@ -132,7 +133,7 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info) } else { - if (!(pick_info.mKeyMask == MASK_SHIFT)) + if (!(mask == MASK_SHIFT)) { LLSelectMgr::getInstance()->deselectAll(); } |