diff options
| author | simon <none@none> | 2013-05-09 13:14:49 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 13:14:49 -0700 |
| commit | c7f7c4bc4d9155f5e9cd83265e189f689739da62 (patch) | |
| tree | 2d4c7e5996a2c5af92f45cf43b8b6dab2e03229f /indra/newview/app_settings/keywords.ini | |
| parent | 5af5b49a6205c34b8787cd4ecb4bd1d94174663f (diff) | |
| parent | d8f00dd1d1d40ec387583575149b1bf9bae79f32 (diff) | |
Merge viewer-beta
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/keywords.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 0b346286c8..a87310955f 100644..100755 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -92,6 +92,9 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req 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 +SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT Passed to llRequestPermissions library function to request permission to silently modify estate access lists +PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override animations on agent +PERMISSION_RETURN_OBJECTS Passed to llRequestPermissions library function to request permission to return objects DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users |