From 1bcf6882c5faa94385f045e1c591da96408bb032 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 23 Sep 2011 15:09:37 -0700
Subject: EXP-1207 : More on lltoolbarview. Still not rendering

---
 indra/newview/skins/default/xui/en/main_view.xml   |  3 ++-
 .../skins/default/xui/en/panel_toolbar_view.xml    | 28 +++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a21c988bb8..448f10a93c 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -170,7 +170,8 @@
         top="0"
         left="0"
         mouse_opaque="false"
-        tab_stop="false"/>
+        tab_stop="false">
+       </panel>
     </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
index b58f8e837a..33a19bcdb0 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<ui_ctrl
+<toolbar_view
  follows="all"
  layout="topleft"
  name="toolbar view"
@@ -16,7 +16,6 @@
   width="30"
   left="0"
   top="0" 
-  button_display_mode="icons_only"
   side="left"
   visible="true" />
  <toolbar
@@ -27,7 +26,6 @@
   width="964"
   left="30"
   top="470" 
-  button_display_mode="icons_with_text"
   side="bottom"
   visible="true" />
  <toolbar
@@ -38,18 +36,20 @@
   width="30"
   left="994"
   top="0" 
-  button_display_mode="icons_only"
   side="right"
   visible="true" />
- <button
-  follows="none"
-  name="test"
+ <panel
+  follows="right|bottom|left"
   layout="topleft"
-  top="100"
-  left="100"
-  height="28"
-  width="28"
-  image_selected="eye_button_active.tga"
-  image_unselected="eye_button_inactive.tga"
+  name="sizer_left"
+  height="500"
+  width="30"
+  left="0"
+  top="0" 
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_opaque_image="Toast_Over"
+  bg_alpha_image="Toast_Background"
   visible="true" />
-</ui_ctrl>
+</toolbar_view>
-- 
cgit v1.2.3