summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-26 18:51:43 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-26 18:51:43 -0700
commit7fd0e8c69e6dced4a770da4fac10c154eac5899f (patch)
tree42da3dccaa4ef4c9025e34341e633eae305d3c25 /indra/newview/skins
parent756532ba8a0a29ca7e5991d8a4f48ddac3bf06ac (diff)
fixed toolbar context menu
deprecated pointless LLView::deleteViewByHandle
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_toolbars.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/toolbar.xml1
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index b3ecd3dcb6..de13fec670 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="825"
+<context_menu
layout="topleft"
name="Toolbars Popup"
visible="false">
@@ -26,4 +26,4 @@
<on_check function="Toolbars.CheckSetting"
parameter="icons_only" />
</menu_item_check>
-</menu>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 95ccc6e92c..29b5d02299 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -7,7 +7,6 @@
pad_between="5"
mouse_opaque="false"
read_only="false">
-
<button_panel name="button_panel"
bg_opaque_image="Rounded_Rect"
background_visible="true"