STORM-807 : Clean up code as discussed with Andrew

4 files changed, 8 insertions, 17 deletions

diff --git a/indra/llmath/llbbox.cpp b/indra/llmath/llbbox.cpp
index d2208f604e..3e2c05a6e6 100644
--- a/indra/llmath/llbbox.cpp
+++ b/indra/llmath/llbbox.cpp
@@ -91,7 +91,7 @@ void LLBBox::addBBoxAgent(const LLBBox& b)
 
 LLBBox LLBBox::getAxisAligned() const
 {
-	// no rotiation = axis aligned rotation
+	// no rotation = axis aligned rotation
 	LLBBox aligned(mPosAgent, LLQuaternion(), LLVector3(), LLVector3());
 
 	// add the center point so that it's not empty
diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h
index aa47f1b524..7b796a0fa8 100644
--- a/indra/llmessage/llregionflags.h
+++ b/indra/llmessage/llregionflags.h
@@ -42,8 +42,6 @@ const U32 REGION_FLAGS_RESET_HOME_ON_TELEPORT	= (1 << 3);
 // Does the sun move?
 const U32 REGION_FLAGS_SUN_FIXED				= (1 << 4);
 
-//const U32 REGION_FLAGS_TAX_FREE					= (1 << 5);	// legacy
-
 // Can't change the terrain heightfield, even on owned parcels,
 // but can plant trees and grass.
 const U32 REGION_FLAGS_BLOCK_TERRAFORM			= (1 << 6);
@@ -53,9 +51,6 @@ const U32 REGION_FLAGS_BLOCK_LAND_RESELL		= (1 << 7);
 
 // All content wiped once per night
 const U32 REGION_FLAGS_SANDBOX					= (1 << 8);
-//const U32 REGION_FLAGS_NULL_LAYER				= (1 << 9);	
-//const U32 REGION_FLAGS_HARD_ALLOW_LAND_TRANSFER	= (1 << 10);
-//const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
 const U32 REGION_FLAGS_SKIP_COLLISIONS			= (1 << 12); // Pin all non agent rigid bodies
 const U32 REGION_FLAGS_SKIP_SCRIPTS				= (1 << 13);
 const U32 REGION_FLAGS_SKIP_PHYSICS				= (1 << 14); // Skip all physics
@@ -78,21 +73,13 @@ const U32 REGION_FLAGS_ESTATE_SKIP_SCRIPTS		= (1 << 21);
 const U32 REGION_FLAGS_RESTRICT_PUSHOBJECT		= (1 << 22);
 
 const U32 REGION_FLAGS_DENY_ANONYMOUS			= (1 << 23);
-//const U32 REGION_FLAGS_DENY_IDENTIFIED			= (1 << 24);
-//const U32 REGION_FLAGS_DENY_TRANSACTED			= (1 << 25);
 
 const U32 REGION_FLAGS_ALLOW_PARCEL_CHANGES		= (1 << 26);
 
-// Deprecated. Phoeinx 2009-12-11
-// REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER is unused beyond viewer-1.23
-//const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
-
 const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
 
 const U32 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
 const U32 REGION_FLAGS_DENY_AGEUNVERIFIED	= (1 << 30);
-//const U32 REGION_FLAGS_SKIP_MONO_SCRIPTS	= (1 << 31);
-
 
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
 								 REGION_FLAGS_ALLOW_SET_HOME |
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 21de5d28be..5c1a34d555 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -226,7 +226,7 @@ public:
 	virtual BOOL hasLightTexture() const			{ return FALSE; }
 
 	// This method returns true if the object is over land owned by
-	// the agent, one of its groups, or it it encroaches and 
+	// the agent, one of its groups, or it encroaches and 
 	// anti-encroachment is enabled
 	bool isReturnable();
 
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index 1207ef3340..d07e06f6a7 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -159,13 +159,17 @@ bool LLViewerParcelOverlay::encroachesOwned(const std::vector<LLBBox>& boxes) co
 		S32 bottom = S32(llclamp((max.mV[VY] / PARCEL_GRID_STEP_METERS), 0.f, REGION_WIDTH_METERS - 1));
 	
 		for (S32 row = top; row <= bottom; row++)
+		{
 			for (S32 column = left; column <= right; column++)
 			{
 				U8 type = ownership(row, column);
-				if (PARCEL_SELF == type
-					|| PARCEL_GROUP == type )
+				if ((PARCEL_SELF == type)
+					|| (PARCEL_GROUP == type))
+				{
 					return true;
+				}
 			}
+		}
 	}
 	return false;
 }