From 77d52d0435184827cc81626900bb67ecc9d574b0 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 30 Sep 2013 17:19:53 -0400
Subject: [PATCH] Correct git's var region merge botch, fixes dark streaks on
 terrain

---
 indra/newview/llsurfacepatch.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
index 22aa66f17..c2466c5e1 100644
--- a/indra/newview/llsurfacepatch.cpp
+++ b/indra/newview/llsurfacepatch.cpp
@@ -304,6 +304,12 @@ void LLSurfacePatch::calcNormal(const U32 x, const U32 y, const U32 stride)
 				if (!ppatches[i][j]->getNeighborPatch(SOUTH))
 				{
 					poffsets[i][j][1] = 0;
+				}
+				else
+				{
+// <FS:CR> Aurora Sim
+					ppatches[i][j] = ppatches[i][j]->getNeighborPatch(SOUTH);
+					poffsets[i][j][1] += patch_width;
 					poffsets[i][j][2] = ppatches[i][j]->getSurface()->getGridsPerEdge();
 // </FS>CR> Aurora Sim
 				}