diff options
| author | simon <none@none> | 2013-05-09 14:10:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 14:10:45 -0700 |
| commit | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (patch) | |
| tree | 5060f42dca293102c868038f127c1a74f5c4a6aa /indra/newview/app_settings/keywords.ini | |
| parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
| parent | 8895e795763d14c3dae495b3648da3d4a52ba30a (diff) | |
Merge downstream code and viewer-beta
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/keywords.ini | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index ef0f78d4d4..02adbc7af4 100644..100755 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -92,8 +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 -PERMISSION_SILENT_ESTATE_MANAGEMENT Passed to llRequestPermissions library function to request permission to modify estate settings without notifying the owner -PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to change agent's default animations +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 |