diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
commit | ac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch) | |
tree | 0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/newview/app_settings/keywords.ini | |
parent | 1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff) | |
parent | cdb57cb299097b203581a6ef99840350831c321c (diff) |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
-rw-r--r-- | 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 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 |