Partial fix for normal (EXT-4722) Ability to fly in a parcel when flying is disabled in the About Land

- Added forced flying off when entering a parcel with no rights to fly in it.

--HG--
branch : product-engine

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 9d7ccd99c6..b85b42c710 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1591,6 +1591,14 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 				instance->mTeleportInProgress = FALSE;
 				instance->mTeleportFinishedSignal(gAgent.getPositionGlobal());
 			}
+
+			// HACK: This makes agents drop from the sky if they enter a parcel
+			// which is set to no fly.
+			BOOL was_flying = gAgent.getFlying();
+			if (was_flying && !parcel->getAllowFly())
+			{
+				gAgent.setFlying(gAgent.canFly());
+			}
 		}
 	}