From 7bc6e626f40a910b4a3e5b88161e96b9967bd24d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 21 Sep 2011 14:24:38 -0700
Subject: EXP-1207 : LLToolbarView skeleton, nothing operational yet...

---
 indra/newview/app_settings/settings.xml          | 11 ++++++++
 indra/newview/llviewerwindow.cpp                 | 10 +++++++
 indra/newview/skins/default/xui/en/main_view.xml | 35 ++++++++++++++++++++++++
 3 files changed, 56 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7ab9f36b87..edebbcb8cf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2652,6 +2652,17 @@
       <key>Value</key>
       <integer>-1</integer>
     </map>
+    <key>DebugToolbarFUI</key>
+    <map>
+      <key>Comment</key>
+      <string>Turn on the FUI Toolbars</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>DebugViews</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 5893259d96..e92e7f1183 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -76,6 +76,7 @@
 #include "lltimer.h"
 #include "timing.h"
 #include "llviewermenu.h"
+#include "lltoolbarview.h"
 #include "lltooltip.h"
 #include "llmediaentry.h"
 #include "llurldispatcher.h"
@@ -1778,6 +1779,14 @@ void LLViewerWindow::initBase()
 	mHintHolder = main_view->getChild<LLView>("hint_holder")->getHandle();
 	mLoginPanelHolder = main_view->getChild<LLView>("login_panel_holder")->getHandle();
 
+	// Update the toolbar global holder
+	// *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");
+	}
+
+	
 	// 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());
@@ -2000,6 +2009,7 @@ void LLViewerWindow::shutdownViews()
 	gIMMgr = NULL;
 	gToolTipView = NULL;
 
+	gToolBarView = NULL;
 	gFloaterView = NULL;
 	gMorphView = NULL;
 
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a7d1aa963c..54badb1386 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -162,6 +162,41 @@
                       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>
+
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
-- 
cgit v1.2.3