diff options
author | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
commit | 0481494c2df074d2b548d6b80e595a208a2848c3 (patch) | |
tree | f3554fc49b549a4ae2b9d1e9a5f157e478ee38df /indra/newview/app_settings/keywords.ini | |
parent | 4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with 3.7.8-release
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
-rwxr-xr-x | indra/newview/app_settings/keywords.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 3bcb4d666d..a070c8bcd0 100755 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -527,6 +527,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 |