EXP-1211 : Read toolbar default settings from toolbars.xml, no saving of settings done yet.

3 files changed, 24 insertions, 9 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 597a1dd603..38d6ff0f58 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1423,6 +1423,7 @@ set(viewer_APPSETTINGS_FILES
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
     app_settings/std_bump.ini
+    app_settings/toolbars.xml
     app_settings/trees.xml
     app_settings/ultra_graphics.xml
     app_settings/viewerart.xml
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
new file mode 100644
index 0000000000..55327ea919
--- /dev/null
+++ b/indra/newview/app_settings/toolbars.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbars>
+  <bottom_toolbar>
+    <command name="chat"/>
+    <command name="speak"/>
+    <command name="places"/>
+    <command name="people"/>
+    <command name="profile"/>
+    <command name="view"/>
+    <command name="move"/>
+    <command name="howto"/>
+  </bottom_toolbar>
+  <left_toolbar>
+    <command name="avatar"/>
+    <command name="inventory"/>
+    <command name="snapshot"/>
+    <command name="search"/>
+    <command name="shop"/>
+    <command name="move_objects"/>
+    <command name="minimap"/>
+    <command name="preferences"/>
+  </left_toolbar>
+</toolbars>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 23ea516b86..fa7632920b 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -47,9 +47,6 @@
                  top="0"
                  side="left"
                  button_display_mode="icons_only">
-          <command name="avatar"/>
-          <command name="build"/>
-          <command name="chat"/>
         </toolbar>
       </layout_panel>
       <layout_panel name="non_toolbar_panel"
@@ -72,9 +69,6 @@
           top="0"
           side="right"
           button_display_mode="icons_only">
-          <command name="avatar"/>
-          <command name="build"/>
-          <command name="chat"/>
         </toolbar>
       </layout_panel>
     </layout_stack>
@@ -96,9 +90,6 @@
              follows="left|right|bottom"
              button_display_mode="icons_with_text"
              visible="true">
-      <command name="avatar"/>
-      <command name="build"/>
-      <command name="chat"/>
     </toolbar>
   </layout_panel>
   </layout_stack>