diff options
author | Dave Parks <davep@lindenlab.com> | 2012-11-08 13:05:29 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-11-08 13:05:29 -0600 |
commit | c431ddf629b7f1149c44b2063d216dd34bcd2b12 (patch) | |
tree | 7c625873abf2ad80fc25e90e073ff0fcc2e619ab /indra/newview/llworldmapview.cpp | |
parent | b76b81ff811014012856f58970c1aac093507557 (diff) | |
parent | 8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r-- | indra/newview/llworldmapview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index a3ccf87cfc..ccc513b80d 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -1320,7 +1320,7 @@ void LLWorldMapView::drawTrackingCircle( const LLRect& rect, S32 x, S32 y, const gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.pushMatrix(); - gGL.translatef((F32)x, (F32)y, 0.f); + gGL.translatef((F32)x * LLUI::sGLScaleFactor.mV[VX], (F32)y * LLUI::sGLScaleFactor.mV[VY], 0.f); gl_washer_segment_2d(inner_radius, outer_radius, start_theta, end_theta, 40, color, color); gGL.popMatrix(); |