From 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 22 Jul 2008 20:55:02 +0000 Subject: 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. --- indra/newview/lltexturectrl.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'indra/newview/lltexturectrl.cpp') diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 83b5cdbb66..c522bd0697 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1452,15 +1452,13 @@ LLToolTexEyedropper::~LLToolTexEyedropper() BOOL LLToolTexEyedropper::handleMouseDown(S32 x, S32 y, MASK mask) { - // this will affect framerate on mouse down - const LLPickInfo& pick = gViewerWindow->pickImmediate(x, y, FALSE); - LLViewerObject* hit_obj = pick.getObject(); + LLViewerObject* hit_obj = gViewerWindow->lastObjectHit(); if (hit_obj && !hit_obj->isAvatar()) { - if( (0 <= pick.mObjectFace) && (pick.mObjectFace < hit_obj->getNumTEs()) ) + if( (0 <= gLastHitObjectFace) && (gLastHitObjectFace < hit_obj->getNumTEs()) ) { - LLViewerImage* image = hit_obj->getTEImage( pick.mObjectFace ); + LLViewerImage* image = hit_obj->getTEImage( gLastHitObjectFace ); if( image ) { if( mCallback ) -- cgit v1.2.3