diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-09-21 17:28:27 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-21 17:28:27 -0700 |
commit | cdedc4ab99444a48dc27d4a8fb48c7af043d377c (patch) | |
tree | 87182cfca3008075359a89f504775c690395ecba /indra/newview/skins/default | |
parent | 412e29ed9d62e975a5290c6008558a739b88065d (diff) | |
parent | 5ae6bbc848e0146bb4b5ea5dd4a5d26d2c5702ba (diff) |
Merge with latest
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 35 |
1 files changed, 35 insertions, 0 deletions
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" |