Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

1 files changed, 22 insertions, 23 deletions

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 3625ce5088..e4aaca1bd0 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -5,7 +5,7 @@
            icon="Command_AboutLand_Icon"
            label_ref="Command_AboutLand_Label"
            tooltip_ref="Command_AboutLand_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="about_land"
            is_running_function="Floater.IsOpen"
            is_running_parameters="about_land"
@@ -15,7 +15,7 @@
            icon="Command_Appearance_Icon"
            label_ref="Command_Appearance_Label"
            tooltip_ref="Command_Appearance_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="appearance"
            is_running_function="Floater.IsOpen"
            is_running_parameters="appearance"
@@ -25,7 +25,7 @@
            icon="Command_Avatar_Icon"
            label_ref="Command_Avatar_Label"
            tooltip_ref="Command_Avatar_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="avatar"
            is_running_function="Floater.IsOpen"
            is_running_parameters="avatar"
@@ -35,7 +35,7 @@
            icon="Command_Build_Icon"
            label_ref="Command_Build_Label"
            tooltip_ref="Command_Build_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="build"
            is_enabled_function="Agent.IsActionAllowed"
            is_enabled_parameters="build"
@@ -47,7 +47,7 @@
            icon="Command_Chat_Icon"
            label_ref="Command_Chat_Label"
            tooltip_ref="Command_Chat_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="chat_bar"
            is_running_function="Floater.IsOpen"
            is_running_parameters="chat_bar"
@@ -57,7 +57,7 @@
            icon="Command_Compass_Icon"
            label_ref="Command_Compass_Label"
            tooltip_ref="Command_Compass_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="compass"
            is_running_function="Floater.IsOpen"
            is_running_parameters="compass"
@@ -67,7 +67,7 @@
            icon="Command_Destinations_Icon"
            label_ref="Command_Destinations_Label"
            tooltip_ref="Command_Destinations_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="destinations"
            is_running_function="Floater.IsOpen"
            is_running_parameters="destinations"
@@ -77,7 +77,7 @@
            icon="Command_Gestures_Icon"
            label_ref="Command_Gestures_Label"
            tooltip_ref="Command_Gestures_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="gestures"
            is_running_function="Floater.IsOpen"
            is_running_parameters="gestures"
@@ -87,8 +87,7 @@
            icon="Command_HowTo_Icon"
            label_ref="Command_HowTo_Label"
            tooltip_ref="Command_HowTo_Tooltip"
-           execute_function="Floater.ToolbarToggle"
-           execute_parameters="help_browser"
+           execute_function="Help.ToggleHowTo"
            is_running_function="Floater.IsOpen"
            is_running_parameters="help_browser"
            />
@@ -97,7 +96,7 @@
            icon="Command_Inventory_Icon"
            label_ref="Command_Inventory_Label"
            tooltip_ref="Command_Inventory_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="my_inventory"
            is_running_function="Floater.IsOpen"
            is_running_parameters="my_inventory"
@@ -107,7 +106,7 @@
            icon="Command_Map_Icon"
            label_ref="Command_Map_Label"
            tooltip_ref="Command_Map_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="world_map"
            is_running_function="Floater.IsOpen"
            is_running_parameters="world_map"
@@ -117,7 +116,7 @@
            icon="Command_Marketplace_Icon"
            label_ref="Command_Marketplace_Label"
            tooltip_ref="Command_Marketplace_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="marketplace"
            is_running_function="Floater.IsOpen"
            is_running_parameters="marketplace"
@@ -127,7 +126,7 @@
            icon="Command_MiniMap_Icon"
            label_ref="Command_MiniMap_Label"
            tooltip_ref="Command_MiniMap_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="mini_map"
            is_running_function="Floater.IsOpen"
            is_running_parameters="mini_map"
@@ -137,7 +136,7 @@
            icon="Command_Move_Icon"
            label_ref="Command_Move_Label"
            tooltip_ref="Command_Move_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="moveview"
            is_running_function="Floater.IsOpen"
            is_running_parameters="moveview"
@@ -147,7 +146,7 @@
            icon="Command_People_Icon"
            label_ref="Command_People_Label"
            tooltip_ref="Command_People_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="people"
            is_running_function="Floater.IsOpen"
            is_running_parameters="people"
@@ -157,7 +156,7 @@
            icon="Command_Picks_Icon"
            label_ref="Command_Picks_Label"
            tooltip_ref="Command_Picks_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="picks"
            is_running_function="Floater.IsOpen"
            is_running_parameters="picks"
@@ -167,7 +166,7 @@
            icon="Command_Places_Icon"
            label_ref="Command_Places_Label"
            tooltip_ref="Command_Places_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="places"
            is_running_function="Floater.IsOpen"
            is_running_parameters="places"
@@ -177,7 +176,7 @@
            icon="Command_Preferences_Icon"
            label_ref="Command_Preferences_Label"
            tooltip_ref="Command_Preferences_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="preferences"
            is_running_function="Floater.IsOpen"
            is_running_parameters="preferences"
@@ -195,7 +194,7 @@
            icon="Command_Search_Icon"
            label_ref="Command_Search_Label"
            tooltip_ref="Command_Search_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="search"
            is_running_function="Floater.IsOpen"
            is_running_parameters="search"
@@ -205,7 +204,7 @@
            icon="Command_Snapshot_Icon"
            label_ref="Command_Snapshot_Label"
            tooltip_ref="Command_Snapshot_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="snapshot"
            is_running_function="Floater.IsOpen"
            is_running_parameters="snapshot"
@@ -229,7 +228,7 @@
            icon="Command_View_Icon"
            label_ref="Command_View_Label"
            tooltip_ref="Command_View_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="camera"
            is_running_function="Floater.IsOpen"
            is_running_parameters="camera"
@@ -239,7 +238,7 @@
            icon="Command_Voice_Icon"
            label_ref="Command_Voice_Label"
            tooltip_ref="Command_Voice_Tooltip"
-           execute_function="Floater.ToolbarToggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="voice_controls"
            is_running_function="Floater.IsOpen"
            is_running_parameters="voice_controls"