livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1839

meow-7.2.2
Oz Linden 2012-05-01 13:27:02 -04:00
parent 5d92c60a4a 9df3afc1ef
commit 0248aa5ec2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -621,6 +621,7 @@ Jonathan Yap
STORM-1799
STORM-1796
STORM-1807
STORM-1839
STORM-1842
STORM-1808
STORM-1809

2
indra/llinventory/llparcel.h
View File

@ -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;