diff options
| author | simon <none@none> | 2013-03-25 11:12:52 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 11:12:52 -0700 |
| commit | 98a82c50d539451e1931826ca75fbc01d611806d (patch) | |
| tree | 3c3dcac20286246f0724c11f126233702f0bdaaf /indra/newview/llspatialpartition.cpp | |
| parent | 94ae64d6fd30e4dbc3280cd277f772c038ccd9fe (diff) | |
| parent | 515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff) | |
Pull in downstream CHUI code from viewer-development
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 af740fe73d..3ed6e24498 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -2746,7 +2746,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); @@ -3997,7 +3997,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)); } |