diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
| commit | 0a74d1593513dc3209fdb29a8dc56b2794b36a29 (patch) | |
| tree | 1af644fe9ad3c62999c177ae37cbeff2ffe19d62 /indra/newview/pipeline.cpp | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
| parent | 54b9992eaefe2b68d16a6264c1901f12612e99dc (diff) | |
Merge between james/viewer-identity-evolution and dessie/viewer-public
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c8f834c7f7..89db03da1e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -70,6 +70,8 @@ #include "llfloaterreg.h" #include "llgldbg.h" #include "llhudmanager.h" +#include "llhudnametag.h" +#include "llhudtext.h" #include "lllightconstants.h" #include "llresmgr.h" #include "llselectmgr.h" @@ -2114,6 +2116,7 @@ void LLPipeline::shiftObjects(const LLVector3 &offset) } LLHUDText::shiftAll(offset); + LLHUDNameTag::shiftAll(offset); display_update_camera(); } @@ -5320,7 +5323,8 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start, ++iter) { LLVOAvatar* av = (LLVOAvatar*) *iter; - if (av->mNameText.notNull() && av->mNameText->lineSegmentIntersect(start, local_end, position)) + if (av->mNameText.notNull() + && av->mNameText->lineSegmentIntersect(start, local_end, position)) { drawable = av->mDrawable; local_end = position; |