From 12b6065a507eb3d78f6b03b764a3a91100dc4455 Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Sat, 15 Oct 2016 17:55:26 -0500
Subject: [PATCH] Fix merge breakage
---
indra/newview/llworld.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index aae3220828..1c71829e3d 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1034,10 +1034,10 @@ void LLWorld::updateWaterObjects()
center_y = min_y + (wy >> 1);
S32 add_boundary[4] = {
- (S32)(512 - (max_x - region_x)),
- (S32)(512 - (max_y - region_y)),
- (S32)(512 - (region_x - min_x)),
- (S32)(512 - (region_y - min_y)) };
+ static_cast<S32>(512 - (max_x - (rwidth - 256) - region_x)),
+ static_cast<S32>(512 - (max_y - (rwidth - 256) - region_y)),
+ 512 - ((S32)region_x - min_x),
+ 512 - ((S32)region_y - min_y) };
S32 dir;
for (dir = 0; dir < 8; dir++)
--
GitLab