diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-07 18:44:16 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-07 18:44:16 -0700 |
| commit | 60c85dff83918876b23ab1ff1dfd336fc9dbc839 (patch) | |
| tree | 74a99cfc8bcf36e6354c7f74c1f7a2c7ae054140 /indra/newview/app_settings | |
| parent | feabe29f356ca2bae5275a5cb0d772614166d2c5 (diff) | |
| parent | 3a280f747dae737fd03bd4c2c886aa6231c0b703 (diff) | |
Pull from richard/viewer-experience-fui/
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index ae8471aa15..dab57d44bd 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" /> @@ -207,6 +209,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> |