summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/keywords.ini
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-05-28 09:06:58 -0700
committerCallum Prentice <callum@lindenlab.com>2014-05-28 09:06:58 -0700
commit038f250caea80e21192372019dca8fdcf269c0d9 (patch)
tree2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/app_settings/keywords.ini
parentfbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
-rwxr-xr-xindra/newview/app_settings/keywords.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index ad843bca14..17c70ef1c5 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -526,6 +526,7 @@ REGION_FLAG_SANDBOX Used with llGetRegionFlags to find if a region is a sand
REGION_FLAG_DISABLE_COLLISIONS Used with llGetRegionFlags to find if a region has disabled collisions
REGION_FLAG_DISABLE_PHYSICS Used with llGetRegionFlags to find if a region has disabled physics
REGION_FLAG_BLOCK_FLY Used with llGetRegionFlags to find if a region blocks flying
+REGION_FLAG_BLOCK_FLYOVER Used with llGetRegionFlags to find if a region enforces higher altitude parcel access rules
REGION_FLAG_ALLOW_DIRECT_TELEPORT Used with llGetRegionFlags to find if a region allows direct teleports
REGION_FLAG_RESTRICT_PUSHOBJECT Used with llGetRegionFlags to find if a region restricts llPushObject() calls