diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
| commit | edf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch) | |
| tree | 68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/llcallingcard.cpp | |
| parent | 01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
pull changes for Sunshine beta
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
| -rw-r--r-- | indra/newview/llcallingcard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 30306b230f..14583e402d 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -184,7 +184,8 @@ LLVector3d LLAvatarTracker::getGlobalPos() global_pos = object->getPositionGlobal(); // HACK - for making the tracker point above the avatar's head // rather than its groin - global_pos.mdV[VZ] += 0.7f * ((LLVOAvatar *)object)->mBodySize.mV[VZ]; + LLVOAvatar* av = (LLVOAvatar*)object; + global_pos.mdV[VZ] += 0.7f * (av->mBodySize.mV[VZ] + av->mAvatarOffset.mV[VZ]); mTrackingData->mGlobalPositionEstimate = global_pos; } |