diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-08-01 14:07:24 -0700 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-08-01 14:07:24 -0700 |
commit | b7555a3309bda8e9689627901051aa90fcb7be34 (patch) | |
tree | bbb84478c302539f434bab7a620fe23456926236 /indra/llinventory | |
parent | 62379fd7628afa5ce1b104ff66b26821ce740c29 (diff) | |
parent | 92a0db2a4f5397067e087068f736181e618e9c0a (diff) |
Merge back viewer-lion, which has viewer-development and down-stream fixes
Diffstat (limited to 'indra/llinventory')
-rw-r--r-- | indra/llinventory/llparcel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index e36d0b20d2..f0b2caca3d 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -45,7 +45,7 @@ const S32 PARCEL_UNIT_AREA = 16; const F32 PARCEL_HEIGHT = 50.f; //Height above ground which parcel boundries exist for explicitly banned avatars -const F32 BAN_HEIGHT = 768.f; +const F32 BAN_HEIGHT = 5000.f; // Maximum number of entries in an access list const S32 PARCEL_MAX_ACCESS_LIST = 300; |