diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 11:31:08 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 11:31:08 +0000 |
| commit | cdd3a7ecab1b9506eba52e8da92f349a4f7f2359 (patch) | |
| tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) | |
| parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
PE merge
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 8 |
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()); + } } } |