From d43621f92f8ed54bf3004f5ebff39288ed01f395 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sun, 27 Mar 2011 12:45:03 +0200
Subject: Fix #811: Map tiles are deformed when NOT on Aurora.

Caused by uninitialized members.
---
 linden/indra/newview/llworldmap.cpp     | 4 +++-
 linden/indra/newview/llworldmapview.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index bd3996d..608d720 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -81,7 +81,9 @@ LLSimInfo::LLSimInfo()
 	mAccess(0x0),
 	mRegionFlags(0x0),
 	mWaterHeight(0.f),
-	mAlpha(-1.f)
+	mAlpha(-1.f),
+	msizeX(REGION_WIDTH_UNITS),
+	msizeY(REGION_WIDTH_UNITS)
 {
 }
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 8d9ed1b..d7a6838 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -472,7 +472,7 @@ void LLWorldMapView::draw()
 		F32 bottom =	sPanY + half_height + relative_y;
 		F32 left =		sPanX + half_width + relative_x;
 		F32 top =		bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
-		F32 right =		left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+		F32 right =		left + (sMapScale * info->msizeX / REGION_WIDTH_METERS);
 
 		// Switch to world map texture (if available for this region) if either:
 		// 1. Tiles are zoomed out small enough, or
-- 
cgit v1.1