Skip to content
Snippets Groups Projects
Commit 0248aa5e authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1839

parents 5d92c60a 9df3afc1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ 0248aa5e
......@@ -621,6 +621,7 @@ Jonathan Yap
STORM-1799
STORM-1796
STORM-1807
STORM-1839
STORM-1842
STORM-1808
STORM-1809
......
indra/llinventory/llparcel.h
+ 1
− 1
View file @ 0248aa5e
......@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment