summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-09-23 15:09:37 -0700
committerMerov Linden <merov@lindenlab.com>2011-09-23 15:09:37 -0700
commit1bcf6882c5faa94385f045e1c591da96408bb032 (patch)
treedd1ad52f6c8dc166a413d3a7d78fc1e3836e7dac /indra/newview/skins/default/xui
parentf50d28303c28fdccc5f06dcbc1147a9d3223d07f (diff)
EXP-1207 : More on lltoolbarview. Still not rendering
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_toolbar_view.xml28
2 files changed, 16 insertions, 15 deletions
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>