diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 19:27:15 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 19:27:15 +0000 |
| commit | 69a36cb5ce03d7631162117e471dc37bc8e8f4b6 (patch) | |
| tree | b7600112c0bd3dc33af759057d9b0c78bcc880b3 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 78553cce481e0f05485033ff9a64d53d13893d97 (diff) | |
| parent | 917841120f8932af112896344c7f25be7bc32773 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 7ec650629d..a075a706e1 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1597,14 +1597,6 @@ 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()); - } } } |