Merging release fixes to default branch

indra/newview/skins/default/xui/en/floater_script.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
+ legacy_header_height="14"
  background_visible="true"
 
 
@@ -21,7 +21,7 @@ follows="left|top|right|bottom"
  visible="false"
  width="310"
  can_resize="false"
- header_height="4"
+ header_height="14"
  min_width="310"
  min_height="200">
 </floater>

indra/newview/skins/default/xui/en/panel_notification_script.xml

@@ -3,7 +3,7 @@
 <panel
   background_opaque="false"
   border_visible="false"
-  background_visible="true"
+  background_visible="false"
   bg_alpha_color="ScriptDialog"
   bg_opaque_color="ScriptDialog"
   label="notification_panel"

indra/newview/skins/metaharper/colors.xml

@@ -11,7 +11,9 @@
 
 	-->
 
-	 
+	 <color
+        name="ScriptDialog"
+        value="0.49 0.33 0.25 1.0" />
 	<color
 	 name="AccentColor"
 	 value="0.75 0.92 0.49 1.0" />

indra/newview/skins/metaharper/xui/en/panel_notification.xml

@@ -2,10 +2,10 @@
 <!-- lots of colors changed in this file -->
 <panel
   background_opaque="false"
-      border_visible="false"
+  border_visible="false"
   background_visible="true"
-  bg_alpha_color="Cerise_0"
-  bg_opaque_color="Cerise_0"
+  bg_alpha_color="SchemeLightest"
+  bg_opaque_color="SchemeLightest""
   label="notification_panel"
   layout="topleft"
   left="0"

indra/newview/skins/starlight/colors.xml

@@ -332,7 +332,7 @@
      reference="Unused?" />
     <color
      name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White_25" />
 <!-- Color Changed -->
     <color
      name="ButtonImageColor"

indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml

@@ -332,7 +332,7 @@
      reference="Unused?" />
     <color
      name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White_25" />
 <!-- Color Changed -->
     <color
      name="ButtonImageColor"

indra/newview/skins/starlight/themes/original_orange/colors.xml

@@ -332,7 +332,7 @@
      reference="Unused?" />
     <color
      name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White_25" />
 <!-- Color Changed -->
     <color
      name="ButtonImageColor"

indra/newview/skins/starlight/themes/original_teal/colors.xml

@@ -332,7 +332,7 @@
      reference="Unused?" />
     <color
      name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White_25" />
 <!-- Color Changed -->
     <color
      name="ButtonImageColor"

indra/newview/skins/starlight/themes/silver_blue/colors.xml

@@ -346,7 +346,7 @@
      reference="Unused?" />
     <color
      name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White_25" />
 <!-- Color Changed -->
     <color
      name="ButtonImageColor"
@@ -889,4 +889,4 @@
     <color
      name="MenuBarProjectBgColor"
      reference="MdBlue" />
-</colors>
+</colors>

indra/newview/skins/starlight/themes/silver_pink/colors.xml

@@ -334,7 +334,7 @@
      reference="Unused?" />
     <color
      name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White_25" />
 <!-- Color Changed -->
     <color
      name="ButtonImageColor"
@@ -877,4 +877,4 @@
     <color
      name="MenuBarProjectBgColor"
      reference="MdBlue" />
-</colors>
+</colors>

indra/newview/skins/starlight/xui/en/main_view.xml

@@ -86,7 +86,7 @@
                    width="500">
 <!-- first element on rest of screen is top info bar - so is just below nav bar -->
             <panel follows="left|top|right"
-                   height="55"
+                   height="42"
 					background_opaque="true"
 					background_visible="false"
 					bg_opaque_color="red"
@@ -276,4 +276,4 @@
                 name="tooltip view"
                 tab_group="-2"
                 width="1024"/>
-</panel>
+</panel>

indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_opaque="true"
- background_visible="false"
- bg_opaque_color="green"
- bg_alpha_color="green"
+ background_visible="true"
+ bg_opaque_color="DkGray"
+ bg_alpha_color="DkGray"
  follows="left|bottom|right"
- height="50"
+ height="37"
  bottom="5"
  layout="topleft"
  name="navigation_bar"
@@ -18,8 +17,9 @@
 	 bg_alpha_color="DkGray"
 	 background_opaque="true"
 	 follows="left|top|right"
-	 height="30"
-	 top="0"
+	 height="22"
+	 top_delta="0"
+         top_pad="0"
 	 layout="topleft"
 	 name="navigation_panel"
 	 width="2054">
@@ -134,13 +134,11 @@
         </search_combo_box>
 	</panel>
   <favorites_bar
-  	 auto_resize="true"
-	 background_visible="true"
-	 bg_opaque_color="green"
-	 bg_alpha_color="green"
-	 background_opaque="true"
+         background_visible="true"
+         bg_opaque_color="DkGray"
+         bg_alpha_color="DkGray"
      follows="left|top|right"
-     top_pad="3"
+     top_pad="2"
      font="SansSerifSmall"
      height="15"
      layout="topleft"