1 files changed, 9 insertions, 5 deletions

diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 443ee74..8d9ed1b 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -471,8 +471,8 @@ void LLWorldMapView::draw()
                 // When the view isn't panned, 0,0 = center of rectangle
                 F32 bottom =    sPanY + half_height + relative_y;
                 F32 left =              sPanX + half_width + relative_x;
-                F32 top =               bottom + sMapScale ;
-                F32 right =             left + sMapScale ;
+                F32 top =               bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+                F32 right =             left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
 
                 // Switch to world map texture (if available for this region) if either:
                 // 1. Tiles are zoomed out small enough, or
@@ -567,17 +567,21 @@ void LLWorldMapView::draw()
                 center_global.mdV[VX] += 128.0;
                 center_global.mdV[VY] += 128.0;
 
-                S32 draw_size = llround(sMapScale);
+                S32 x_draw_size = llround(sMapScale);
+                S32 y_draw_size = llround(sMapScale);
+                x_draw_size *= info->msizeX / REGION_WIDTH_METERS;
+                y_draw_size *= info->msizeY / REGION_WIDTH_METERS;
+                
                 if (simimage != NULL)
                 {
                         simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
-                        simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+                        simimage->setKnownDrawSize(llround(x_draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(y_draw_size * LLUI::sGLScaleFactor.mV[VY]));
                 }
 
                 if (overlayimage != NULL)
                 {
                         overlayimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
-                        overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+                        overlayimage->setKnownDrawSize(llround(x_draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(y_draw_size * LLUI::sGLScaleFactor.mV[VY]));
                 }
                         
 //              LLTextureView::addDebugImage(simimage);