diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
| commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
| tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llworldmapview.cpp | |
| parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge changes for 3.4.5
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(); |