diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 12:31:25 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 12:31:25 +0000 |
| commit | ef5cbcb0604cbffbb6c153a433411fedcf4e5831 (patch) | |
| tree | 06ff2fa6856e43b37a78b2dfa64e56008ce91b5c /indra/newview/llviewerparcelmgr.cpp | |
| parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) | |
| parent | d2c2d3f58e8d150c993708cbf13fc584a557ced7 (diff) | |
Merge from viewer2.
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()); + } } } |