aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/en-us
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-05-27 21:50:01 -0700
committerJacek Antonelli2011-06-02 23:01:00 -0500
commit154cee6b4aab7c9723552212f5679d3c10fc1e90 (patch)
tree3a45da5e6af54f648b4ae951c99979207bfb08d1 /linden/indra/newview/skins/default/xui/en-us
parentFixed #875 by removing menu border introduced in 84ba6c13 (diff)
downloadmeta-impy-154cee6b4aab7c9723552212f5679d3c10fc1e90.zip
meta-impy-154cee6b4aab7c9723552212f5679d3c10fc1e90.tar.gz
meta-impy-154cee6b4aab7c9723552212f5679d3c10fc1e90.tar.bz2
meta-impy-154cee6b4aab7c9723552212f5679d3c10fc1e90.tar.xz
Fixing the menu to actually use its color options reveals how broken the whole system is.
In this case, fixing the viewer menu color breaks the login menu bar. Seems like a better breakage alternative for the beta, though (cherry picked from commit 084bd7a120e9ac122e4356246a1da57fd8f1204e)
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_login.xml5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml2
2 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d17fad5..4582f4e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,5 +1,8 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right"> 2<menu_bar name="Login Menu" opaque="true" tear_off="false"
3 mouse_opaque="false"
4 drop_shadow="false"
5 height="18" bottom="-18" follows="left|top|right">
3 <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false" 6 <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false"
4 drop_shadow="true" mouse_opaque="false"> 7 drop_shadow="true" mouse_opaque="false">
5 <menu_item_call label="Quit" name="Quit" shortcut="control|Q"> 8 <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 0ebbf74..df1cdf2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2 2
3<menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right" 3<menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right"
4 opaque="false" tear_off="false"> 4 opaque="false" mouse_opaque="false" tear_off="false">
5 5
6 6
7 <!-- FILE --> 7 <!-- FILE -->