diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
commit | 91b2ff00ae874f938919373c0db3de0721c7bf25 (patch) | |
tree | e0c4c8e11cd4a158c1f7d53fea7434eee3781d97 /indra/newview/llviewerparcelmgr.cpp | |
parent | 617a7a0ebdd47aeea578456f4ed0d91ab8582a0b (diff) | |
parent | 68ea862c96a96be631505e88ae870d6aab066eb9 (diff) |
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 cac233f694..07c8867e26 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()); - } } } |