From 3e76862aaa0852d5fd34e2321c69c67df41b5f67 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Fri, 29 Jan 2010 20:43:55 +0200 Subject: 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 --- indra/newview/llviewerparcelmgr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra') 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()); + } } } -- cgit v1.2.3