PE merge.

5 files changed, 37 insertions, 2 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index ae686d9ab7..28616d503b 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -6,7 +6,7 @@
  border="false"
  bg_opaque_image="Window_Foreground" 
  bg_alpha_image="Window_Background" 
- bg_alpha_color="0 0 0 0"
+ bg_alpha_image_overlay="DkGray_66" 
  legacy_header_height="18"
  can_minimize="true"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 61ff66b407..4c4867b862 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -354,6 +354,24 @@
                function="ToggleControl"
                parameter="ShowParcelOwners" />
           </menu_item_check>
+          <menu_item_check
+             label="Coordinates"
+             name="Coordinates">
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="NavBarShowCoordinates" />
+            <menu_item_check.on_check
+               control="NavBarShowCoordinates" />
+          </menu_item_check>
+          <menu_item_check
+             label="Parcel Properties"
+             name="Parcel Properties">
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="NavBarShowParcelProperties" />
+            <menu_item_check.on_check
+               control="NavBarShowParcelProperties" />
+          </menu_item_check>
         </menu>
         <menu_item_separator
          layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef983dacfe..4fa5d965c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5205,9 +5205,23 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    type="notify">
 [NAME] declined your friendship offer.
   </notification>
+  
+    <notification
+   icon="notify.tga"
+   name="FriendshipAcceptedByMe"
+   type="offer">
+Friend request accepted.
+  </notification>
 
   <notification
    icon="notify.tga"
+   name="FriendshipDeclinedByMe"
+   type="offer">
+Friend request declined.
+  </notification>
+  
+  <notification
+   icon="notify.tga"
    name="OfferCallingCard"
    type="notify">
 [FIRST] [LAST] is offering their calling card.
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 51e2256a7d..250dadd390 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -2,7 +2,8 @@
 <panel
 	 background_visible="true"
      bevel_style="in"
-     bg_alpha_color="black"
+     bg_opaque_color="Black" 
+     bg_alpha_color="DkGray_66"
      follows="top|left|right"
      height="24"
      label="im_header"
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
index 7262c0dc5c..9bf99fa363 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel.xml
@@ -6,6 +6,8 @@
 -->
 <panel bg_opaque_color="PanelFocusBackgroundColor"
        bg_alpha_color="PanelDefaultBackgroundColor"
+       bg_opaque_image_overlay="White"
+       bg_alpha_image_overlay="White"
        background_visible="false"
        background_opaque="false"
        chrome="false"/>
\ No newline at end of file