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)

3 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 63ca3e0..b90f8aa 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -85,7 +85,7 @@
 <ScrollReadOnlyColor value="100, 100, 100, 255" />      <!-- Color for inactive but not disabled lists -->
  
 <!-- MENUS -->
-<MenuBarBgColor value="0, 0, 0, 255" />                         <!-- Menu bar background -->
+<MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
 <MenuBarGodBgColor value="62, 128, 62, 255" />              <!-- Menu bar background with God Mode enabled -->
 <MenuNonProductionGodBgColor value="0, 128, 0, 255" />      <!-- Beta viewer menu bar background -->
 <MenuNonProductionBgColor value="128, 0, 0, 255" />         <!-- Beta viewer menu bar background with God Mode enabled -->
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 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right">
+<menu_bar name="Login Menu" opaque="true" tear_off="false" 
+          mouse_opaque="false"
+          drop_shadow="false"
+          height="18" bottom="-18" follows="left|top|right">
         <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false"
         drop_shadow="true" mouse_opaque="false">
     <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 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right"
-          opaque="false" tear_off="false">
+          opaque="false" mouse_opaque="false" tear_off="false">
 
 
   <!-- FILE -->