From 86442d1f8beae66890231c12ddc1cd9e1f1a6170 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 01:43:00 +0000
Subject: added Flickr and Twitter FUI buttons for ACME-1179

---
 indra/newview/app_settings/commands.xml | 20 ++++++++++++++++++++
 1 file changed, 20 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 60c942094a..6c9b67ac0b 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -226,6 +226,26 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="social"
            />
+  <command name="flickr"
+           available_in_toybox="true"
+           icon="Command_Social_Icon"
+           label_ref="Command_Flickr_Label"
+           tooltip_ref="Command_Flickr_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="flickr"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="flickr"
+           />
+  <command name="twitter"
+           available_in_toybox="true"
+           icon="Command_Social_Icon"
+           label_ref="Command_Twitter_Label"
+           tooltip_ref="Command_Twitter_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="twitter"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="twitter"
+           />
   <command name="speak"
            available_in_toybox="true"
            icon="Command_Speak_Icon"
-- 
cgit v1.2.3


From 9946965c4decd59793adcaa39c70dbf9778d61dd Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 20:07:54 +0000
Subject: replaced Flickr and Twitter FUI icons for ACME-1181

---
 indra/newview/app_settings/commands.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 6c9b67ac0b..f4e9cc0136 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -228,7 +228,7 @@
            />
   <command name="flickr"
            available_in_toybox="true"
-           icon="Command_Social_Icon"
+           icon="Command_Flickr_Icon"
            label_ref="Command_Flickr_Label"
            tooltip_ref="Command_Flickr_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -238,7 +238,7 @@
            />
   <command name="twitter"
            available_in_toybox="true"
-           icon="Command_Social_Icon"
+           icon="Command_Twitter_Icon"
            label_ref="Command_Twitter_Label"
            tooltip_ref="Command_Twitter_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-- 
cgit v1.2.3


From 9108354e9d39d93dadbad34ff5ba7ecb7abc7bf9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 5 Dec 2013 00:28:28 +0000
Subject: Renamed floater_social to floater_facebook for ACME-1205

---
 indra/newview/app_settings/commands.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 f4e9cc0136..7b329e2092 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -216,15 +216,15 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="snapshot"
            />
-  <command name="social"
+  <command name="facebook"
            available_in_toybox="true"
-           icon="Command_Social_Icon"
-           label_ref="Command_Social_Label"
-           tooltip_ref="Command_Social_Tooltip"
+           icon="Command_Facebook_Icon"
+           label_ref="Command_Facebook_Label"
+           tooltip_ref="Command_Facebook_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="social"
+           execute_parameters="facebook"
            is_running_function="Floater.IsOpen"
-           is_running_parameters="social"
+           is_running_parameters="facebook"
            />
   <command name="flickr"
            available_in_toybox="true"
-- 
cgit v1.2.3