summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-02-03 21:20:37 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-02-03 21:20:37 +0200
commit917841120f8932af112896344c7f25be7bc32773 (patch)
tree2c508826ffc7b9f5f2892d5436529c53157c3df8 /indra
parentfb4adc1898f45ffc8311706a9b3430d5d0df1893 (diff)
Backed out changeset 83d2ec4d4a5e, a hack that forces you to fall when entering a parcel with no rights to fly in it.
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp8
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());
- }
}
}