Merge branch 'master' into bullet-2.82

This commit is contained in:
Robert Adams
2014-09-03 21:21:01 -07:00
23 changed files with 79 additions and 268 deletions

View File

@@ -711,6 +711,9 @@
;
max_distance = 65535
; Allow avatars to cross into and out of the region.
AllowAvatarCrossing = true
; Minimum user level required for HyperGrid teleports
LevelHGTeleport = 0