3 files changed, 28 insertions, 8 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index ce878f156b..d332583ca9 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -260,15 +260,35 @@
            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"
+           icon="Command_Flickr_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_Twitter_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"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d9093c2a6d..a82d0b3f95 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13119,7 +13119,7 @@
     <key>SocialPhotoResolution</key>
     <map>
       <key>Comment</key>
-      <string>Default resolution when sharing photo using the social floater</string>
+      <string>Default resolution when sharing photo using the social floaters</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 86f9912815..d61aee9a14 100755
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -6,7 +6,6 @@
     <command name="speak"/>
     <command name="destinations"/>
     <command name="people"/>
-    <command name="social"/>
     <command name="profile"/>
     <command name="move"/>
     <command name="view"/>
@@ -22,5 +21,6 @@
     <command name="voice"/>
     <command name="minimap"/>
     <command name="snapshot"/>
+    <command name="facebook"/>
   </left_toolbar>
 </toolbars>