From c238027dd9917b1633ff5f16911fbdbe437f9a55 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 14 Jun 2012 16:47:43 -0700
Subject: CHUI-139 : Use the Chat toolbar button to open and close the
 conversations multi floater. Force Nearby Conversation if floater is empty.

---
 indra/newview/app_settings/commands.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 73df064ab2..51211a8ce5 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -46,11 +46,11 @@
            available_in_toybox="true"
            icon="Command_Chat_Icon"
            label_ref="Command_Chat_Label"
-           tooltip_ref="Command_Chat_Tooltip"
+           tooltip_ref="Command_Conversations_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="chat_bar"
+           execute_parameters="im_container"
            is_running_function="Floater.IsOpen"
-           is_running_parameters="chat_bar"
+           is_running_parameters="im_container"
            />
   <command name="compass"
            available_in_toybox="false"
-- 
cgit v1.2.3


From 7ba6111d9149baea48869c2f30506581d2c6babf Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 2 Oct 2012 21:32:23 +0300
Subject: CHUI-190 (Remove the Voice Settings floater): removed the menu item
 "Communicate > Voice settings" and the FUI button (headphones) from the
 Toybox (Toolbox). I left a floater in the project to be able to reconnect it
 to a different location.

---
 indra/newview/app_settings/commands.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 51211a8ce5..d4bbd84d0f 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -239,14 +239,4 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="camera"
            />
-  <command name="voice"
-           available_in_toybox="true"
-           icon="Command_Voice_Icon"
-           label_ref="Command_Voice_Label"
-           tooltip_ref="Command_Voice_Tooltip"
-           execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="voice_controls"
-           is_running_function="Floater.IsOpen"
-           is_running_parameters="voice_controls"
-           />
 </commands>
-- 
cgit v1.2.3


From edeeed95416be2679e1ad3d29bab5396dbcccaa2 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 21 Nov 2012 01:41:49 +0200
Subject: CHUI-531 FIXED Poor fps in CHUI viewer

---
 indra/newview/app_settings/commands.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index d4bbd84d0f..4659673333 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -44,6 +44,7 @@
            />
   <command name="chat"
            available_in_toybox="true"
+		   is_flashing_allowed="true"
            icon="Command_Chat_Icon"
            label_ref="Command_Chat_Label"
            tooltip_ref="Command_Conversations_Tooltip"
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/app_settings/commands.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/app_settings/commands.xml

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 90b5bd51486e8a5cb5072974c331d1ed61b7e08b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 1 Jul 2013 15:06:30 -0700
Subject: ACME-645 : Implement the Facebook FUI button. No code, all xml
 wizardry...

---
 indra/newview/app_settings/commands.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 4659673333..60c942094a 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -216,6 +216,16 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="snapshot"
            />
+  <command name="social"
+           available_in_toybox="true"
+           icon="Command_Social_Icon"
+           label_ref="Command_Social_Label"
+           tooltip_ref="Command_Social_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="social"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="social"
+           />
   <command name="speak"
            available_in_toybox="true"
            icon="Command_Speak_Icon"
-- 
cgit v1.2.3


From 48f702029f498b83c6a9ade54c3814def0df4bc8 Mon Sep 17 00:00:00 2001
From: dmitry <none@none>
Date: Fri, 2 Aug 2013 18:00:08 +0300
Subject: MAINT-2914 FIXED Mousing over UI elements does not make them light up

---
 indra/newview/app_settings/commands.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 4659673333..aa8e3b5166 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -13,6 +13,7 @@
   <command name="appearance"  
            available_in_toybox="true"
            icon="Command_Appearance_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Appearance_Label"
            tooltip_ref="Command_Appearance_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -23,6 +24,7 @@
   <command name="avatar"
            available_in_toybox="true"
            icon="Command_Avatar_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Avatar_Label"
            tooltip_ref="Command_Avatar_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -94,6 +96,7 @@
   <command name="inventory"
            available_in_toybox="true"
            icon="Command_Inventory_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Inventory_Label"
            tooltip_ref="Command_Inventory_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -121,6 +124,7 @@
   <command name="minimap"
            available_in_toybox="true"
            icon="Command_MiniMap_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_MiniMap_Label"
            tooltip_ref="Command_MiniMap_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -171,6 +175,7 @@
   <command name="places"
            available_in_toybox="true"
            icon="Command_Places_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Places_Label"
            tooltip_ref="Command_Places_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -199,6 +204,7 @@
   <command name="search"
            available_in_toybox="true"
            icon="Command_Search_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Search_Label"
            tooltip_ref="Command_Search_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -209,6 +215,7 @@
   <command name="snapshot"
            available_in_toybox="true"
            icon="Command_Snapshot_Icon"
+           hover_icon="Command_Highlighting_Icon"
            label_ref="Command_Snapshot_Label"
            tooltip_ref="Command_Snapshot_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-- 
cgit v1.2.3


From f8e5ae8006b144b111f474640beb96ae135ae8ed Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Fri, 4 Oct 2013 14:04:31 +0300
Subject: MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6
 (280797)

---
 indra/newview/app_settings/commands.xml | 55 ++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 7 deletions(-)

(limited to 'indra/newview/app_settings/commands.xml')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index aa8e3b5166..376e1a70af 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -3,6 +3,8 @@
   <command name="aboutland"
            available_in_toybox="true"
            icon="Command_AboutLand_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_AboutLand_Label"
            tooltip_ref="Command_AboutLand_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -13,7 +15,8 @@
   <command name="appearance"  
            available_in_toybox="true"
            icon="Command_Appearance_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Appearance_Label"
            tooltip_ref="Command_Appearance_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -24,7 +27,8 @@
   <command name="avatar"
            available_in_toybox="true"
            icon="Command_Avatar_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Avatar_Label"
            tooltip_ref="Command_Avatar_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -35,6 +39,8 @@
   <command name="build"
            available_in_toybox="true"
            icon="Command_Build_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Build_Label"
            tooltip_ref="Command_Build_Tooltip"
            execute_function="Build.Toggle"
@@ -48,6 +54,8 @@
            available_in_toybox="true"
 		   is_flashing_allowed="true"
            icon="Command_Chat_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Chat_Label"
            tooltip_ref="Command_Conversations_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -58,6 +66,8 @@
   <command name="compass"
            available_in_toybox="false"
            icon="Command_Compass_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Compass_Label"
            tooltip_ref="Command_Compass_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -68,6 +78,8 @@
   <command name="destinations"
            available_in_toybox="true"
            icon="Command_Destinations_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Destinations_Label"
            tooltip_ref="Command_Destinations_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -78,6 +90,8 @@
   <command name="gestures"
            available_in_toybox="true"
            icon="Command_Gestures_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Gestures_Label"
            tooltip_ref="Command_Gestures_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -88,6 +102,8 @@
   <command name="howto"
            available_in_toybox="true"
            icon="Command_HowTo_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_HowTo_Label"
            tooltip_ref="Command_HowTo_Tooltip"
            execute_function="Help.ToggleHowTo"
@@ -96,7 +112,8 @@
   <command name="inventory"
            available_in_toybox="true"
            icon="Command_Inventory_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Inventory_Label"
            tooltip_ref="Command_Inventory_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -107,6 +124,8 @@
   <command name="map"
            available_in_toybox="true"
            icon="Command_Map_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Map_Label"
            tooltip_ref="Command_Map_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -117,6 +136,8 @@
   <command name="marketplace"
            available_in_toybox="false"
            icon="Command_Marketplace_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Marketplace_Label"
            tooltip_ref="Command_Marketplace_Tooltip"
            execute_function="Avatar.OpenMarketplace"
@@ -124,7 +145,8 @@
   <command name="minimap"
            available_in_toybox="true"
            icon="Command_MiniMap_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_MiniMap_Label"
            tooltip_ref="Command_MiniMap_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -135,6 +157,8 @@
   <command name="move"
            available_in_toybox="true"
            icon="Command_Move_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Move_Label"
            tooltip_ref="Command_Move_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -145,6 +169,8 @@
   <command name="outbox"
            available_in_toybox="false"
            icon="Command_Outbox_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Outbox_Label"
            tooltip_ref="Command_Outbox_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -155,6 +181,8 @@
   <command name="people"
            available_in_toybox="true"
            icon="Command_People_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_People_Label"
            tooltip_ref="Command_People_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -165,6 +193,8 @@
   <command name="picks"
            available_in_toybox="true"
            icon="Command_Picks_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Picks_Label"
            tooltip_ref="Command_Picks_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -175,7 +205,8 @@
   <command name="places"
            available_in_toybox="true"
            icon="Command_Places_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Places_Label"
            tooltip_ref="Command_Places_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -186,6 +217,8 @@
   <command name="preferences"
            available_in_toybox="true"
            icon="Command_Preferences_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Preferences_Label"
            tooltip_ref="Command_Preferences_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -196,6 +229,8 @@
   <command name="profile"
            available_in_toybox="true"
            icon="Command_Profile_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Profile_Label"
            tooltip_ref="Command_Profile_Tooltip"
            execute_function="Avatar.ToggleMyProfile"
@@ -204,7 +239,8 @@
   <command name="search"
            available_in_toybox="true"
            icon="Command_Search_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Search_Label"
            tooltip_ref="Command_Search_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -215,7 +251,8 @@
   <command name="snapshot"
            available_in_toybox="true"
            icon="Command_Snapshot_Icon"
-           hover_icon="Command_Highlighting_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Snapshot_Label"
            tooltip_ref="Command_Snapshot_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -226,6 +263,8 @@
   <command name="speak"
            available_in_toybox="true"
            icon="Command_Speak_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_Speak_Label"
            tooltip_ref="Command_Speak_Tooltip"
            execute_function="Agent.PressMicrophone"
@@ -240,6 +279,8 @@
   <command name="view"
            available_in_toybox="true"
            icon="Command_View_Icon"
+           hover_icon_unselected="Command_Highlighting_Icon"
+           hover_icon_selected="Command_Highlighting_Selected_Icon"
            label_ref="Command_View_Label"
            tooltip_ref="Command_View_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-- 
cgit v1.2.3