diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
commit | dbac37dcb50bf44255c2b622d418bb4339f1afca (patch) | |
tree | acffbcb5984696e507243f939f6b9c5a951b755b /indra/newview/app_settings/keywords.ini | |
parent | 790dfda43472da75d17a848eb91e2dcecb2b96e7 (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
merge latest viewer-release
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 |