summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/keywords.ini
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-05-20 17:41:00 +0200
committerKitty Barnett <develop@catznip.com>2012-05-20 17:41:00 +0200
commit1300f77fdd48d90d09a05058ffdf10df93092391 (patch)
tree1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/app_settings/keywords.ini
parent8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff)
parentaa0a0542a10ba6faeca34afd6e323b505493d8dc (diff)
Merged with viewer-beta
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
-rw-r--r--indra/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 82b43432eb..318b69438a 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -91,6 +91,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
# PERMISSION_CHANGE_PERMISSIONS Passed to llRequestPermissions library function to request permission to change permissions
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
+PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users