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/llvoavatar.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/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 47090d5c65..287f063757 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -622,6 +622,8 @@ LLVOAvatar::LLVOAvatar( LLViewerRegion* regionp) : LLViewerObject(id, pcode, regionp), + mHUDTargetZoom(1.f), + mHUDCurZoom(1.f), mLastHeadBakedID( IMG_DEFAULT_AVATAR ), mLastUpperBodyBakedID( IMG_DEFAULT_AVATAR ), mLastLowerBodyBakedID( IMG_DEFAULT_AVATAR ), @@ -3248,8 +3250,7 @@ void LLVOAvatar::idleUpdateTractorBeam() } else { - const LLPickInfo& pick = gViewerWindow->getLastPick(); - mBeam->setPositionGlobal(pick.mPosGlobal); + mBeam->setPositionGlobal(gLastHitNonFloraPosGlobal + gLastHitNonFloraObjectOffset); } } |