diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h
index 8d51207a9..c1cf26574 100644
--- a/indra/llmessage/llregionflags.h
+++ b/indra/llmessage/llregionflags.h
@@ -78,6 +78,8 @@ const U64 REGION_FLAGS_DENY_ANONYMOUS			= (1 << 23);
 
 const U64 REGION_FLAGS_ALLOW_PARCEL_CHANGES		= (1 << 26);
 
+const U64 REGION_FLAGS_BLOCK_FLYOVER = (1 << 27);
+
 const U64 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
 
 const U64 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index d7d591cc5..f7e592afb 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -594,7 +594,8 @@ void parse_string();
 "REGION_FLAG_SANDBOX"		{ count(); yylval.ival = REGION_FLAGS_SANDBOX; return(INTEGER_CONSTANT); }
 "REGION_FLAG_DISABLE_COLLISIONS"		{ count(); yylval.ival = REGION_FLAGS_SKIP_COLLISIONS; return(INTEGER_CONSTANT); }
 "REGION_FLAG_DISABLE_PHYSICS"		{ count(); yylval.ival = REGION_FLAGS_SKIP_PHYSICS; return(INTEGER_CONSTANT); }
-"REGION_FLAG_BLOCK_FLY"		{ count(); yylval.ival = REGION_FLAGS_BLOCK_FLY; return(INTEGER_CONSTANT); }
+"REGION_FLAG_BLOCK_FLY"			{ count(); yylval.ival = REGION_FLAGS_BLOCK_FLY; return(INTEGER_CONSTANT); }
+"REGION_FLAG_BLOCK_FLYOVER"		{ count(); yylval.ival = REGION_FLAGS_BLOCK_FLYOVER; return(INTEGER_CONSTANT); }
 "REGION_FLAG_ALLOW_DIRECT_TELEPORT"		{ count(); yylval.ival = REGION_FLAGS_ALLOW_DIRECT_TELEPORT; return(INTEGER_CONSTANT); }
 "REGION_FLAG_RESTRICT_PUSHOBJECT"		{ count(); yylval.ival = REGION_FLAGS_RESTRICT_PUSHOBJECT; return(INTEGER_CONSTANT); }
 
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 1a4be7432..d880d48f3 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -563,6 +563,7 @@ REGION_FLAG_SANDBOX                    Used with llGetRegionFlags to find if a r
 REGION_FLAG_DISABLE_COLLISIONS         Used with llGetRegionFlags to find if a region has disabled collisions
 REGION_FLAG_DISABLE_PHYSICS            Used with llGetRegionFlags to find if a region has disabled physics
 REGION_FLAG_BLOCK_FLY                  Used with llGetRegionFlags to find if a region blocks flying
+REGION_FLAG_BLOCK_FLYOVER			Used with llGetRegionFlags to find if a region enforces higher altitude parcel access rules
 REGION_FLAG_ALLOW_DIRECT_TELEPORT      Used with llGetRegionFlags to find if a region allows direct teleports
 REGION_FLAG_RESTRICT_PUSHOBJECT        Used with llGetRegionFlags to find if a region restricts llPushObject() calls
 
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index da8aaedd4..5998b2360 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -412,6 +412,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 
 	panel->getChild<LLUICtrl>("block_terraform_check")->setValue((region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
 	panel->getChild<LLUICtrl>("block_fly_check")->setValue((region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );
+	panel->getChild<LLUICtrl>("block_fly_over_check")->setValue((region_flags & REGION_FLAGS_BLOCK_FLYOVER) ? TRUE : FALSE );
 	panel->getChild<LLUICtrl>("allow_damage_check")->setValue((region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE );
 	panel->getChild<LLUICtrl>("restrict_pushobject")->setValue((region_flags & REGION_FLAGS_RESTRICT_PUSHOBJECT) ? TRUE : FALSE );
 	panel->getChild<LLUICtrl>("allow_land_resell_check")->setValue((region_flags & REGION_FLAGS_BLOCK_LAND_RESELL) ? FALSE : TRUE );
@@ -712,6 +713,7 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
 	// Enable the "Apply" button if something is changed. JC
 	initCtrl("block_terraform_check");
 	initCtrl("block_fly_check");
+	initCtrl("block_fly_over_check");
 	initCtrl("allow_damage_check");
 	initCtrl("allow_land_resell_check");
 	initCtrl("allow_parcel_changes_check");
@@ -877,6 +879,7 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 	{
 		body["block_terraform"] = getChild<LLUICtrl>("block_terraform_check")->getValue();
 		body["block_fly"] = getChild<LLUICtrl>("block_fly_check")->getValue();
+		body["block_fly_over"] = getChild<LLUICtrl>("block_fly_over_check")->getValue();
 		body["allow_damage"] = getChild<LLUICtrl>("allow_damage_check")->getValue();
 		body["allow_land_resell"] = getChild<LLUICtrl>("allow_land_resell_check")->getValue();
 		body["agent_limit"] = getChild<LLUICtrl>("agent_limit_spin")->getValue();
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 3da03923c..53caaee64 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -677,7 +677,8 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV
 	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 	LLGLDisable cull(GL_CULL_FACE);
 	
-	if (mCollisionBanned == BA_BANNED)
+	if (mCollisionBanned == BA_BANNED ||
+		regionp->getRegionFlag(REGION_FLAGS_BLOCK_FLYOVER))
 	{
 		collision_height = BAN_HEIGHT;
 	}
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 1b6eee985..b72abe0ca 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -130,7 +130,7 @@ public:
 	void setAllowSetHome(BOOL b) { setRegionFlag(REGION_FLAGS_ALLOW_SET_HOME, b); }
 	void setResetHomeOnTeleport(BOOL b) { setRegionFlag(REGION_FLAGS_RESET_HOME_ON_TELEPORT, b); }
 	void setSunFixed(BOOL b) { setRegionFlag(REGION_FLAGS_SUN_FIXED, b); }
-	void setBlockFly(BOOL b) { setRegionFlag(REGION_FLAGS_BLOCK_FLY, b); }
+	//void setBlockFly(BOOL b) { setRegionFlag(REGION_FLAGS_BLOCK_FLY, b); }		Never used
 	void setAllowDirectTeleport(BOOL b) { setRegionFlag(REGION_FLAGS_ALLOW_DIRECT_TELEPORT, b); }
 
 
diff --git a/indra/newview/skins/apollo/keywords.ini b/indra/newview/skins/apollo/keywords.ini
index 3cf07133a..8d0fd6b71 100644
--- a/indra/newview/skins/apollo/keywords.ini
+++ b/indra/newview/skins/apollo/keywords.ini
@@ -563,6 +563,7 @@ REGION_FLAG_SANDBOX                    Used with llGetRegionFlags to find if a r
 REGION_FLAG_DISABLE_COLLISIONS         Used with llGetRegionFlags to find if a region has disabled collisions
 REGION_FLAG_DISABLE_PHYSICS            Used with llGetRegionFlags to find if a region has disabled physics
 REGION_FLAG_BLOCK_FLY                  Used with llGetRegionFlags to find if a region blocks flying
+REGION_FLAG_BLOCK_FLYOVER			Used with llGetRegionFlags to find if a region enforces higher altitude parcel access rules
 REGION_FLAG_ALLOW_DIRECT_TELEPORT      Used with llGetRegionFlags to find if a region allows direct teleports
 REGION_FLAG_RESTRICT_PUSHOBJECT        Used with llGetRegionFlags to find if a region restricts llPushObject() calls
 
diff --git a/indra/newview/skins/gemini/keywords.ini b/indra/newview/skins/gemini/keywords.ini
index 3cf07133a..8d0fd6b71 100644
--- a/indra/newview/skins/gemini/keywords.ini
+++ b/indra/newview/skins/gemini/keywords.ini
@@ -563,6 +563,7 @@ REGION_FLAG_SANDBOX                    Used with llGetRegionFlags to find if a r
 REGION_FLAG_DISABLE_COLLISIONS         Used with llGetRegionFlags to find if a region has disabled collisions
 REGION_FLAG_DISABLE_PHYSICS            Used with llGetRegionFlags to find if a region has disabled physics
 REGION_FLAG_BLOCK_FLY                  Used with llGetRegionFlags to find if a region blocks flying
+REGION_FLAG_BLOCK_FLYOVER			Used with llGetRegionFlags to find if a region enforces higher altitude parcel access rules
 REGION_FLAG_ALLOW_DIRECT_TELEPORT      Used with llGetRegionFlags to find if a region allows direct teleports
 REGION_FLAG_RESTRICT_PUSHOBJECT        Used with llGetRegionFlags to find if a region restricts llPushObject() calls