From 30843129037cbda9973478359226d18c8fa382cb Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 12 Feb 2020 13:45:43 -0500
Subject: [PATCH] Fix world map tiles failing to render on minimap in opensim
var-regions. Ref #51
---
indra/newview/llnetmap.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index cff86b5513..be2cb564d7 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -271,8 +271,8 @@ void LLNetMap::draw()
// background region rectangle
F32 bottom = relative_y;
F32 left = relative_x;
- F32 top = bottom + (real_width / REGION_WIDTH_METERS) * mScale ;
- F32 right = left + (real_width / REGION_WIDTH_METERS) * mScale ;
+ F32 top = bottom + (real_width / region_width) * mScale ;
+ F32 right = left + (real_width / region_width) * mScale ;
if (regionp == curregionp)
{
@@ -293,10 +293,10 @@ void LLNetMap::draw()
if (use_world_map_image)
{
const LLViewerRegion::tex_matrix_t& tiles(regionp->getWorldMapTiles());
- for (S32 i(0), scaled_width((S32)real_width / region_width), square_width(scaled_width * scaled_width);
+ for (S32 i(0), scaled_width(real_width / region_width), square_width(scaled_width * scaled_width);
i < square_width; ++i)
{
- const F32 y(i / (F32)scaled_width);
+ const F32 y(i / scaled_width);
const F32 x(i - y * scaled_width);
const F32 local_left(left + x * mScale);
const F32 local_right(local_left + mScale);
--
GitLab