EXP-1207 : More work on LLToolbarView, still not operational...

4 files changed, 74 insertions, 38 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index cc9e17409f..148b80e817 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1858,7 +1858,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
     <key>Cursor3D</key>
     <map>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 1055fd373b..d197782eed 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1783,10 +1783,17 @@ void LLViewerWindow::initBase()
 	// *TODO: Eventually, suppress the existence of this debug setting and turn toolbar FUI on permanently
 	if (gSavedSettings.getBOOL("DebugToolbarFUI"))
 	{
-		gToolBarView = main_view->getChild<LLToolBarView>("Toolbar View");
+		llinfos << "Merov debug : Creating the toolbar view" << llendl;
+		// Get a pointer to the toolbar view holder
+		LLPanel* panel_holder = main_view->getChild<LLPanel>("toolbar_view_holder");
+		llinfos << "Merov debug : panel_holder = " << panel_holder << llendl;
+		// Load the toolbar view from file 
+		gToolBarView = LLUICtrlFactory::getInstance()->createFromFile<LLToolBarView>("panel_toolbar_view.xml", NULL, LLPanel::child_registry_t::instance());
+		llinfos << "Merov debug : gToolBarView = " << gToolBarView << llendl;
+		// Attach it to the toolbar view holder
+		panel_holder->addChild(gToolBarView);
 	}
 
-	
 	// Constrain floaters to inside the menu and status bar regions.
 	gFloaterView = main_view->getChild<LLFloaterView>("Floater View");
 	gFloaterView->setFloaterSnapView(main_view->getChild<LLView>("floater_snap_region")->getHandle());
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 54badb1386..a21c988bb8 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -162,41 +162,15 @@
                       top="0"
                       width="1024"/>
       </panel>
-	  
-      <panel follows="left|top"
-			layout="topleft"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="toolbar_view_holder"
-                    tab_stop="false"
-                    top="0"
-					visible="true"
-                    width="1024">
-        <toolbar_view follows="left|top"
-			layout="topleft"
-                      height="100"
-                      left="100"
-                      mouse_opaque="false"
-                      name="Toolbar View"
-                      tab_stop="false"
-                      top="100"
-					  visible="true"
-                      width="512">
-    <button
-     follows="left|top"
-     height="28"
-     image_selected="eye_button_active.tga"
-     image_unselected="eye_button_inactive.tga"
-     layout="topleft"
-			top="0"
-			left="0"
-     name="color_pipette"
-     width="28"
-	 visible="true" />
-					  </toolbar_view>
-      </panel>
-
+      <panel name="toolbar_view_holder"
+	    follows="all"
+		layout="topleft"
+        height="500"
+        width="1024"
+        top="0"
+        left="0"
+        mouse_opaque="false"
+        tab_stop="false"/>
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
new file mode 100644
index 0000000000..b58f8e837a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<ui_ctrl
+ follows="all"
+ layout="topleft"
+ name="toolbar view"
+ height="500"
+ width="1024"
+ mouse_opaque="false"
+ tab_stop="false"
+ visible="true">
+ <toolbar
+  follows="top|bottom|left"
+  layout="topleft"
+  name="toolbar_left"
+  height="500"
+  width="30"
+  left="0"
+  top="0" 
+  button_display_mode="icons_only"
+  side="left"
+  visible="true" />
+ <toolbar
+  follows="right|bottom|left"
+  layout="topleft"
+  name="toolbar_bottom"
+  height="30"
+  width="964"
+  left="30"
+  top="470" 
+  button_display_mode="icons_with_text"
+  side="bottom"
+  visible="true" />
+ <toolbar
+  follows="top|bottom|right"
+  layout="topleft"
+  name="toolbar_right"
+  height="500"
+  width="30"
+  left="994"
+  top="0" 
+  button_display_mode="icons_only"
+  side="right"
+  visible="true" />
+ <button
+  follows="none"
+  name="test"
+  layout="topleft"
+  top="100"
+  left="100"
+  height="28"
+  width="28"
+  image_selected="eye_button_active.tga"
+  image_unselected="eye_button_inactive.tga"
+  visible="true" />
+</ui_ctrl>