diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:44:47 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:44:47 -0700 |
| commit | f83fcc357ff23418b0692bdaf3ae998f870685a0 (patch) | |
| tree | 731cd8ac153fcd4ed3ef7e5e8d63cc2c60b46117 /indra/newview/app_settings/keywords.ini | |
| parent | 05921cfcb2db7ccc8fb872d942eb236b839e3dad (diff) | |
| parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/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 7a9be77f96..6120f22ba4 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 |