diff options
| author | James Cook <james@lindenlab.com> | 2010-03-09 14:28:48 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-09 14:28:48 -0800 |
| commit | 717a4800f1ae0ae6ea0bbe9ed0af21c7851f5d0a (patch) | |
| tree | 88eaacce1385606e9f0f98b3d46108dc0f06ed26 /indra/newview/pipeline.cpp | |
| parent | 60aa61e1cc5d3c42f54368a2b0b9eccfe5d315ff (diff) | |
Break name tag code out into LLHUDNameTag
Start by duplicating the LLHUDText code, then stripping out
functionality that only needs to exist in one place (like
force-based juggling of name tag positions)
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4de1560f16..31c245dc57 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -69,6 +69,7 @@ #include "llfloaterreg.h" #include "llgldbg.h" #include "llhudmanager.h" +#include "llhudnametag.h" #include "llhudtext.h" #include "lllightconstants.h" #include "llresmgr.h" @@ -2080,6 +2081,7 @@ void LLPipeline::shiftObjects(const LLVector3 &offset) } LLHUDText::shiftAll(offset); + LLHUDNameTag::shiftAll(offset); display_update_camera(); } @@ -5269,7 +5271,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; |