diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
| commit | a154ec72f759e20add6aacfab7f04e65b49051b9 (patch) | |
| tree | 6410887f2466911a7a28574e7778d6fc7d416c67 /indra/newview/app_settings | |
| parent | 60a09f20f450ced238afc74e806d080b3c13cc33 (diff) | |
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index f53a384608..c2a2ce2755 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -37,7 +37,7 @@ at_target at_target(integer tnum, vector targetpos, vector ourpos):Result of ll not_at_target not_at_target():Result of llTarget library function call at_rot_target at_rot_target(integer tnum, rotation targetrot, rotation ourrot):Result of LLRotTarget library function call not_at_rot_target not_at_rot_target():Result of LLRotTarget library function call -money money(key id, integer amount):Triggered when money is given to task +money money(key id, integer amount):Triggered when L$ is given to task email email(string time, string address, string subj, string message, integer num_left):Triggered when task receives email run_time_permissions run_time_permissions(integer perm):Triggered when an agent grants run time permissions to task attach attach(key id):Triggered when an agent attaches or detaches from agent @@ -79,7 +79,7 @@ CONTROL_UP Passed to llTakeControls library function and used control event CONTROL_DOWN Passed to llTakeControls library function and used control event handler to test for agent down control CONTROL_LBUTTON Passed to llTakeControls library function and used control event handler to test for agent left button control CONTROL_ML_LBUTTON Passed to llTakeControls library function and used control event handler to test for agent left button control with the agent in mouse look -PERMISSION_DEBIT Passed to llRequestPermissions library function to request permission to take money from agent's account +PERMISSION_DEBIT Passed to llRequestPermissions library function to request permission to take L$ from agent's account PERMISSION_TAKE_CONTROLS Passed to llRequestPermissions library function to request permission to take agent's controls # PERMISSION_REMAP_CONTROLS Passed to llRequestPermissions library function to request permission to remap agent's controls (not implemented yet) PERMISSION_TRIGGER_ANIMATION Passed to llRequestPermissions library function to request permission to trigger animation on agent |