From 2b247cddf6a7a7b98d73da2bdb943d5c967c8f91 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 20 Feb 2012 13:47:30 +0100 Subject: [PATCH] Fixed annoying behavior of toolbar buttons to instantly close instead of giving focus first --- indra/newview/app_settings/commands.xml | 44 ++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 9012bd4385..c61f29c11e 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.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="about_land" is_enabled_function="RLV.EnableIfNot" is_enabled_parameters="showloc" @@ -17,7 +17,7 @@ icon="Command_Appearance_Icon" label_ref="Command_Appearance_Label" tooltip_ref="Command_Appearance_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="appearance" is_running_function="Floater.IsOpen" is_running_parameters="appearance" @@ -27,7 +27,7 @@ icon="Command_Avatar_Icon" label_ref="Command_Avatar_Label" tooltip_ref="Command_Avatar_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="avatar" is_running_function="Floater.IsOpen" is_running_parameters="avatar" @@ -49,7 +49,7 @@ icon="Command_Chat_Icon" label_ref="Command_Chat_Label" tooltip_ref="Command_Chat_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="im_container" is_running_function="Floater.IsOpen" is_running_parameters="im_container" @@ -59,7 +59,7 @@ icon="Command_Compass_Icon" label_ref="Command_Compass_Label" tooltip_ref="Command_Compass_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="compass" is_running_function="Floater.IsOpen" is_running_parameters="compass" @@ -69,7 +69,7 @@ icon="Command_Destinations_Icon" label_ref="Command_Destinations_Label" tooltip_ref="Command_Destinations_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="destinations" is_running_function="Floater.IsOpen" is_running_parameters="destinations" @@ -79,7 +79,7 @@ icon="Command_Gestures_Icon" label_ref="Command_Gestures_Label" tooltip_ref="Command_Gestures_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="gestures" is_running_function="Floater.IsOpen" is_running_parameters="gestures" @@ -97,7 +97,7 @@ icon="Command_Inventory_Icon" label_ref="Command_Inventory_Label" tooltip_ref="Command_Inventory_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="inventory" is_enabled_function="RLV.EnableIfNot" is_enabled_parameters="showinv" @@ -109,7 +109,7 @@ icon="Command_Map_Icon" label_ref="Command_Map_Label" tooltip_ref="Command_Map_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="world_map" is_enabled_function="RLV.EnableIfNot" is_enabled_parameters="showworldmap" @@ -128,7 +128,7 @@ icon="Command_MiniMap_Icon" label_ref="Command_MiniMap_Label" tooltip_ref="Command_MiniMap_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="mini_map" is_enabled_function="RLV.EnableIfNot" is_enabled_parameters="showminimap" @@ -140,7 +140,7 @@ icon="Command_Move_Icon" label_ref="Command_Move_Label" tooltip_ref="Command_Move_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="moveview" is_running_function="Floater.IsOpen" is_running_parameters="moveview" @@ -150,7 +150,7 @@ icon="Command_Outbox_Icon" label_ref="Command_Outbox_Label" tooltip_ref="Command_Outbox_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="outbox" is_running_function="Floater.IsOpen" is_running_parameters="outbox" @@ -160,7 +160,7 @@ icon="Command_People_Icon" label_ref="Command_People_Label" tooltip_ref="Command_People_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="people" is_running_function="Floater.IsOpen" is_running_parameters="people" @@ -170,7 +170,7 @@ icon="Command_Picks_Icon" label_ref="Command_Picks_Label" tooltip_ref="Command_Picks_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="picks" is_running_function="Floater.IsOpen" is_running_parameters="picks" @@ -180,7 +180,7 @@ icon="Command_Places_Icon" label_ref="Command_Places_Label" tooltip_ref="Command_Places_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="places" is_running_function="Floater.IsOpen" is_running_parameters="places" @@ -190,7 +190,7 @@ icon="Command_Preferences_Icon" label_ref="Command_Preferences_Label" tooltip_ref="Command_Preferences_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="preferences" is_running_function="Floater.IsOpen" is_running_parameters="preferences" @@ -208,7 +208,7 @@ icon="Command_Search_Icon" label_ref="Command_Search_Label" tooltip_ref="Command_Search_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="search" is_running_function="Floater.IsOpen" is_running_parameters="search" @@ -218,7 +218,7 @@ icon="Command_Snapshot_Icon" label_ref="Command_Snapshot_Label" tooltip_ref="Command_Snapshot_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="snapshot" is_running_function="Floater.IsOpen" is_running_parameters="snapshot" @@ -242,7 +242,7 @@ icon="Command_View_Icon" label_ref="Command_View_Label" tooltip_ref="Command_View_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="camera" is_running_function="Floater.IsOpen" is_running_parameters="camera" @@ -252,7 +252,7 @@ icon="Command_Voice_Icon" label_ref="Command_Voice_Label" tooltip_ref="Command_Voice_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="voice_controls" is_running_function="Floater.IsOpen" is_running_parameters="voice_controls" @@ -264,7 +264,7 @@ icon="phoenix_18" label_ref="Command_Quickprefs_Label" tooltip_ref="Command_Quickprefs_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="quickprefs" is_running_function="Floater.IsOpen" is_running_parameters="quickprefs" @@ -275,7 +275,7 @@ icon="ao_toggle_18" label_ref="Command_AO_Label" tooltip_ref="Command_AO_Tooltip" - execute_function="Floater.ToggleOrBringToFront" + execute_function="Floater.Toggle" execute_parameters="animation_overrider" is_running_function="Floater.IsOpen" is_running_parameters="animation_overrider"