diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 21:30:38 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 21:30:38 +0200 |
| commit | d90dc965874687a40f6ffc90f7edec1301fe293b (patch) | |
| tree | 341ccc5a0c770e8d41fc61138da9fd9984bda4c5 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 5dbd37f50bbefe8552f910d5079b48cd3f648c5e (diff) | |
| parent | 917841120f8932af112896344c7f25be7bc32773 (diff) | |
merge
--HG--
branch : product-engine
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()); - } } } |