diff options
| author | Richard Linden <none@none> | 2012-04-05 16:10:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-05 16:10:07 -0700 |
| commit | 9626ab8fec34f73cd60822bd34376c1cb94e11d7 (patch) | |
| tree | 0b4feb7b49b9a3e3d9936faea0b03aaff1dcb578 /indra/newview/llspatialpartition.cpp | |
| parent | c2afd200a0d55c5137de6f89200a8d4b09ba8b6e (diff) | |
CHUI-89 FIX Make nametags appear consistently next to avatar heads
nametags now track avatar head
avatar_skeleton now loaded as param block
vector3 param block parsing support
fixes for param block recursion
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 5d196a465f..1333862855 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -2774,7 +2774,7 @@ void renderVisibility(LLSpatialGroup* group, LLCamera* camera) void renderCrossHairs(LLVector3 position, F32 size, LLColor4 color) { - gGL.diffuseColor4fv(color.mV); + gGL.color4fv(color.mV); gGL.begin(LLRender::LINES); { gGL.vertex3fv((position - LLVector3(size, 0.f, 0.f)).mV); @@ -3904,7 +3904,7 @@ void renderAgentTarget(LLVOAvatar* avatar) if (avatar->isSelf()) { renderCrossHairs(avatar->getPositionAgent(), 0.2f, LLColor4(1, 0, 0, 0.8f)); - renderCrossHairs(avatar->mDrawable->getPositionAgent(), 0.2f, LLColor4(1, 0, 0, 0.8f)); + renderCrossHairs(avatar->mDrawable->getPositionAgent(), 0.2f, LLColor4(0, 1, 0, 0.8f)); renderCrossHairs(avatar->mRoot.getWorldPosition(), 0.2f, LLColor4(1, 1, 1, 0.8f)); renderCrossHairs(avatar->mPelvisp->getWorldPosition(), 0.2f, LLColor4(0, 0, 1, 0.8f)); } |