diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-10 17:09:31 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-10 17:09:31 -0700 |
| commit | 5b1301ea8a0e50f2d15700a7e93be7628f6feec8 (patch) | |
| tree | f536cbca14fa0cd81d75e7d354bd75b370c18091 /indra/newview/app_settings | |
| parent | fd03ae299bfaf83789e511912d99d204c0833e7f (diff) | |
| parent | 2d1431b2f0bb903be9259cbcae630f605d9c208c (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 14 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index ae8471aa15..f5581baa19 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -37,6 +37,8 @@ tooltip_ref="Command_Build_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="build" + is_enabled_function="Agent.IsActionAllowed" + is_enabled_parameters="build" is_running_function="Floater.IsOpen" is_running_parameters="build" /> @@ -150,6 +152,16 @@ is_running_function="Floater.IsOpen" is_running_parameters="people" /> + <command name="picks" + available_in_toybox="true" + icon="Command_Picks_Icon" + label_ref="Command_Picks_Label" + tooltip_ref="Command_Picks_Tooltip" + execute_function="Floater.ToolbarToggle" + execute_parameters="picks" + is_running_function="Floater.IsOpen" + is_running_parameters="picks" + /> <command name="places" available_in_toybox="true" icon="Command_Places_Icon" @@ -207,6 +219,8 @@ tooltip_ref="Command_Speak_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="speak" + is_enabled_function="Agent.IsActionAllowed" + is_enabled_parameters="speak" is_running_function="Floater.IsOpen" is_running_parameters="speak" /> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 092e69952c..aa2ff646a8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4246,7 +4246,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>InventoryDisplayOutbox</key> <map> |