Merge pull request #1421 from secondlife/DRTVWR-600-maint-A

Drtvwr 600 maint a

1 files changed, 35 insertions, 17 deletions

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index d38d88eb0e..fa69699436 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -6802,45 +6802,63 @@ bool LLVolumeFace::createSide(LLVolume* volume, bool partial_build)
 				mIndices[cur_index++] = s+1 + mNumS*t;			//bottom right
 				mIndices[cur_index++] = s+1 + mNumS*(t+1);		//top right
 
-				mEdge[cur_edge++] = (mNumS-1)*2*t+s*2+1;						//bottom left/top right neighbor face 
-				if (t < mNumT-2) {												//top right/top left neighbor face 
+				// bottom left/top right neighbor face
+				mEdge[cur_edge++] = (mNumS-1)*2*t+s*2+1;
+
+				if (t < mNumT-2)
+				{	// top right/top left neighbor face
 					mEdge[cur_edge++] = (mNumS-1)*2*(t+1)+s*2+1;
 				}
-				else if (mNumT <= 3 || volume->getPath().isOpen() == true) { //no neighbor
+				else if (mNumT <= 3 || volume->getPath().isOpen())
+				{	// no neighbor
 					mEdge[cur_edge++] = -1;
 				}
-				else { //wrap on T
+				else
+				{	// wrap on T
 					mEdge[cur_edge++] = s*2+1;
 				}
-				if (s > 0) {													//top left/bottom left neighbor face
+
+				if (s > 0)
+				{	// top left/bottom left neighbor face
 					mEdge[cur_edge++] = (mNumS-1)*2*t+s*2-1;
 				}
-				else if (flat_face ||  volume->getProfile().isOpen() == true) { //no neighbor
+				else if (flat_face || volume->getProfile().isOpen())
+				{	// no neighbor
 					mEdge[cur_edge++] = -1;
 				}
-				else {	//wrap on S
+				else
+				{	// wrap on S
 					mEdge[cur_edge++] = (mNumS-1)*2*t+(mNumS-2)*2+1;
 				}
-				
-				if (t > 0) {													//bottom left/bottom right neighbor face
+
+				if (t > 0)
+				{	// bottom left/bottom right neighbor face
 					mEdge[cur_edge++] = (mNumS-1)*2*(t-1)+s*2;
 				}
-				else if (mNumT <= 3 || volume->getPath().isOpen() == true) { //no neighbor
+				else if (mNumT <= 3 || volume->getPath().isOpen())
+				{	// no neighbor
 					mEdge[cur_edge++] = -1;
 				}
-				else { //wrap on T
+				else
+				{	// wrap on T
 					mEdge[cur_edge++] = (mNumS-1)*2*(mNumT-2)+s*2;
 				}
-				if (s < mNumS-2) {												//bottom right/top right neighbor face
+
+				if (s < mNumS-2)
+				{	// bottom right/top right neighbor face
 					mEdge[cur_edge++] = (mNumS-1)*2*t+(s+1)*2;
 				}
-				else if (flat_face || volume->getProfile().isOpen() == true) { //no neighbor
+				else if (flat_face || volume->getProfile().isOpen())
+				{	// no neighbor
 					mEdge[cur_edge++] = -1;
 				}
-				else { //wrap on S
+				else
+				{	// wrap on S
 					mEdge[cur_edge++] = (mNumS-1)*2*t;
 				}
-				mEdge[cur_edge++] = (mNumS-1)*2*t+s*2;							//top right/bottom left neighbor face	
+
+				// top right/bottom left neighbor face	
+				mEdge[cur_edge++] = (mNumS-1)*2*t+s*2;
 			}
 		}
 	}
@@ -6977,7 +6995,7 @@ bool LLVolumeFace::createSide(LLVolume* volume, bool partial_build)
 
 	if (sculpt_stitching == LL_SCULPT_TYPE_NONE)  // logic for non-sculpt volumes
 	{
-		if (volume->getPath().isOpen() == false)
+		if (!volume->getPath().isOpen())
 		{ //wrap normals on T
 			for (S32 i = 0; i < mNumS; i++)
 			{
@@ -6988,7 +7006,7 @@ bool LLVolumeFace::createSide(LLVolume* volume, bool partial_build)
 			}
 		}
 
-		if ((volume->getProfile().isOpen() == false) && !(s_bottom_converges))
+		if (!volume->getProfile().isOpen() && !s_bottom_converges)
 		{ //wrap normals on S
 			for (S32 i = 0; i < mNumT; i++)
 			{