diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 23:34:59 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 23:34:59 +0000 |
| commit | fa29880ecd1ca9fb34507e1b712b111a7a3bb63e (patch) | |
| tree | 4d2b4aec4ac8317a88cbd205fb8f5f5b0387af9a /indra/newview/llcallingcard.cpp | |
| parent | fa3f91e454ac82beffe4aca3789445e8ddf2b27f (diff) | |
| parent | 3005bdf7aa628953bf640c1ab69ea7299b5876b1 (diff) | |
merge
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 0d55c4429a..0b8f863e75 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -183,7 +183,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; } |