diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
commit | cc0a4bf6acafe759baaccea65022c963373ea012 (patch) | |
tree | d4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/newview/llworldmapview.cpp | |
parent | 11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff) | |
parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) |
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
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(); |