* Added latest set of FUI buttons and labels according to the wiki

 * Hooked up commands to their respective floaters

1 files changed, 67 insertions, 51 deletions

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 5fbd9248c1..224c1b4b48 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <commands>
+  <command name="aboutland"
+           available_in_toybox="true"
+           icon="Command_AboutLand_Icon"
+           label_ref="Command_AboutLand_Label"
+           tooltip_ref="Command_AboutLand_Tooltip"
+           function="Floater.ToolbarToggle"
+           parameter="about_land"
+           />
+  <command name="appearance"
+           available_in_toybox="true"
+           icon="Command_Appearance_Icon"
+           label_ref="Command_Appearance_Label"
+           tooltip_ref="Command_Appearance_Tooltip"
+           function="Floater.ToolbarToggle"
+           parameter="appearance"
+           />
   <command name="avatar"
            available_in_toybox="true"
            icon="Command_Avatar_Icon"
            label_ref="Command_Avatar_Label"
            tooltip_ref="Command_Avatar_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="avatar"
+           parameter="avatar_picker"
            />
   <command name="build"
            available_in_toybox="true"
@@ -22,7 +38,7 @@
            label_ref="Command_Chat_Label"
            tooltip_ref="Command_Chat_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="chat"
+           parameter="chat_bar"
            />
   <command name="compass"
            available_in_toybox="false"
@@ -32,6 +48,14 @@
            function="Floater.ToolbarToggle"
            parameter="compass"
            />
+  <command name="destinations"
+           available_in_toybox="true"
+           icon="Command_Destinations_Icon"
+           label_ref="Command_Destinations_Label"
+           tooltip_ref="Command_Destinations_Tooltip"
+           function="Floater.ToolbarToggle"
+           parameter="destinations"
+           />
   <command name="gestures"
            available_in_toybox="true"
            icon="Command_Gestures_Icon"
@@ -46,15 +70,15 @@
            label_ref="Command_HowTo_Label"
            tooltip_ref="Command_HowTo_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="howto"
+           parameter="floater_help_browser"
            />
-  <command name="landmarks"
+  <command name="inventory"
            available_in_toybox="true"
-           icon="Command_Landmarks_Icon"
-           label_ref="Command_Landmarks_Label"
-           tooltip_ref="Command_Landmarks_Tooltip"
+           icon="Command_Inventory_Icon"
+           label_ref="Command_Inventory_Label"
+           tooltip_ref="Command_Inventory_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="landmarks"
+           parameter="inventory"
            />
   <command name="map"
            available_in_toybox="true"
@@ -62,7 +86,15 @@
            label_ref="Command_Map_Label"
            tooltip_ref="Command_Map_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="map"
+           parameter="world_map"
+           />
+  <command name="marketplace"
+           available_in_toybox="true"
+           icon="Command_Marketplace_Icon"
+           label_ref="Command_Marketplace_Label"
+           tooltip_ref="Command_Marketplace_Tooltip"
+           function="Floater.ToolbarToggle"
+           parameter="marketplace"
            />
   <command name="minimap"
            available_in_toybox="true"
@@ -70,7 +102,7 @@
            label_ref="Command_MiniMap_Label"
            tooltip_ref="Command_MiniMap_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="minimap"
+           parameter="mini_map"
            />
   <command name="move"
            available_in_toybox="true"
@@ -78,23 +110,7 @@
            label_ref="Command_Move_Label"
            tooltip_ref="Command_Move_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="move"
-           />
-  <command name="myland"
-           available_in_toybox="true"
-           icon="Command_MyLand_Icon"
-           label_ref="Command_MyLand_Label"
-           tooltip_ref="Command_MyLand_Tooltip"
-           function="Floater.ToolbarToggle"
-           parameter="myland"
-           />
-  <command name="mystuff"
-           available_in_toybox="true"
-           icon="Command_MyStuff_Icon"
-           label_ref="Command_MyStuff_Label"
-           tooltip_ref="Command_MyStuff_Tooltip"
-           function="Floater.ToolbarToggle"
-           parameter="mystuff"
+           parameter="moveview"
            />
   <command name="people"
            available_in_toybox="true"
@@ -112,29 +128,29 @@
            function="Floater.ToolbarToggle"
            parameter="places"
            />
-  <command name="search"
+  <command name="preferences"
            available_in_toybox="true"
-           icon="Command_Search_Icon"
-           label_ref="Command_Search_Label"
-           tooltip_ref="Command_Search_Tooltip"
+           icon="Command_Preferences_Icon"
+           label_ref="Command_Preferences_Label"
+           tooltip_ref="Command_Preferences_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="search"
+           parameter="preferences"
            />
-  <command name="settings"
+  <command name="profile"
            available_in_toybox="true"
-           icon="Command_Settings_Icon"
-           label_ref="Command_Settings_Label"
-           tooltip_ref="Command_Settings_Tooltip"
+           icon="Command_Profile_Icon"
+           label_ref="Command_Profile_Label"
+           tooltip_ref="Command_Profile_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="settings"
+           parameter="profile"
            />
-  <command name="shop"
+  <command name="search"
            available_in_toybox="true"
-           icon="Command_Shop_Icon"
-           label_ref="Command_Shop_Label"
-           tooltip_ref="Command_Shop_Tooltip"
+           icon="Command_Search_Icon"
+           label_ref="Command_Search_Label"
+           tooltip_ref="Command_Search_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="shop"
+           parameter="search"
            />
   <command name="snapshot"
            available_in_toybox="true"
@@ -152,20 +168,20 @@
            function="Floater.ToolbarToggle"
            parameter="speak"
            />
-  <command name="upload"
-           available_in_toybox="true"
-           icon="Command_Upload_Icon"
-           label_ref="Command_Upload_Label"
-           tooltip_ref="Command_Upload_Tooltip"
-           function="Floater.ToolbarToggle"
-           parameter="upload"
-           />
   <command name="view"
            available_in_toybox="true"
            icon="Command_View_Icon"
            label_ref="Command_View_Label"
            tooltip_ref="Command_View_Tooltip"
            function="Floater.ToolbarToggle"
-           parameter="view"
+           parameter="camera"
+           />
+  <command name="voice"
+           available_in_toybox="true"
+           icon="Command_Voice_Icon"
+           label_ref="Command_Voice_Label"
+           tooltip_ref="Command_Voice_Tooltip"
+           function="Floater.ToolbarToggle"
+           parameter="voice_controls"
            />
 </commands>