PE merge.

11 files changed, 56 insertions, 43 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 21fe2bb242..a98a049c17 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1603,17 +1603,6 @@
              function="ToggleControl"
              parameter="MouseSmooth" />
         </menu_item_check>
-        <menu_item_check
-         label="Show IMs in Nearby Chat"
-         layout="topleft"
-         name="IMInChat">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="IMInChat" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="IMInChat" />
-        </menu_item_check>
         <menu_item_separator
          layout="topleft" />
         <menu
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1ec004b194..e5933816ef 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -770,6 +770,16 @@ Save changes to classified [NAME]?
      notext="Don&apos;t Save"
      yestext="Save"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="ClassifiedInsuffisientFunds"
+   type="alertmodal">
+Insuffisient funds to create classified.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 15eff4b67c..8e39697a16 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -61,6 +61,7 @@
      height="197"
      width="280"
      layout="topleft"
+     no_commit_on_selection="true"
      top="20"
      left="10"
      name="pick_snapshot" />
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 58cb5fed5d..bfc97ed5da 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -127,7 +127,11 @@
           label="Search [SECOND_LIFE]"
           name="search_combo_editor"/>
          <combo_list
-          draw_border="true" />
+          draw_border="true"
+          border.highlight_light_color="FocusColor"
+          border.highlight_dark_color="FocusColor"
+          border.shadow_light_color="FocusColor"
+          border.shadow_dark_color="FocusColor"/>
         </search_combo_box>
 	</panel>
     <favorites_bar
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 1e7acb566f..141678f7eb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -34,7 +34,14 @@
      name="background"
      tool_tip="Choose color for bubble chat"
      top_delta="1"
-     width="44" />
+     width="44">
+        <color_swatch.init_callback
+		     function="Pref.getUIColor"
+		     parameter="BackgroundChatColor" />
+		    <color_swatch.commit_callback
+		     function="Pref.applyUIColor"
+		     parameter="BackgroundChatColor" />
+    </color_swatch>
     <slider
      control_name="ChatBubbleOpacity"
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 2bec5b8a29..328d521636 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_adhoc
- height="25"
+ height="23"
  name="im_adhoc_chiclet"
  show_speaker="false"
  width="25">
     <chiclet_im_adhoc.chiclet_button 
-     height="25"
+     height="23"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      name="chiclet_button"
@@ -14,27 +14,27 @@
     <chiclet_im_adhoc.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20" />
     <chiclet_im_adhoc.avatar_icon
-     bottom="3"
+     bottom="2"
      follows="left|top|bottom"
      height="19"
      left="3"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="19" />
+     width="18" />
     <chiclet_im_adhoc.unread_notifications
      font_halign="center"
-     height="25"
+     height="23"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20" />
     <chiclet_im_adhoc.new_message_icon
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index 1d7f3208af..60658899ee 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_group
- height="25"
+ height="23"
  name="im_group_chiclet"
  show_speaker="false"
  width="25">
     <chiclet_im_group.chiclet_button 
-     height="25"
+     height="23"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      name="chiclet_button"
@@ -14,28 +14,28 @@
     <chiclet_im_group.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20" />
     <chiclet_im_group.group_icon
-     bottom="3"
+     bottom="2"
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="19"
+     height="18"
      left="3"
      mouse_opaque="false"
      name="group_icon"
      width="19" />
     <chiclet_im_group.unread_notifications
-     height="25"
+     height="23"
      font_halign="center"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20"/>
     <chiclet_im_group.new_message_icon
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index e6289f7cef..b5b8f0d07a 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_p2p
- height="25"
+ height="23"
  name="im_p2p_chiclet"
  show_speaker="false"
  width="25">
     <chiclet_im_p2p.chiclet_button 
-     height="25"
+     height="23"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      name="chiclet_button"
@@ -14,27 +14,27 @@
     <chiclet_im_p2p.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20"/>
     <chiclet_im_p2p.avatar_icon
-     bottom="3"
+     bottom="2"
      follows="left|top|bottom"
-     height="19"
+     height="18"
      left="3"
      mouse_opaque="false"
      name="avatar_icon"
      width="19" />
     <chiclet_im_p2p.unread_notifications
-     height="25"
+     height="23"
      font_halign="center"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20"/>
     <chiclet_im_p2p.new_message_icon
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 138b50c968..1bf9bc9e71 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_offer
- height="25"
+ height="23"
  name="offer_chiclet"
  width="25">
  <chiclet_offer.chiclet_button 
-  height="25"
+  height="23"
   image_selected="PushButton_Selected"
   image_unselected="PushButton_Off"
   name="chiclet_button"
   tab_stop="false"
   width="25"/>
  <chiclet_offer.icon
-  bottom="3"
+  bottom="2"
   default_icon="Generic_Object_Small"
   follows="all"
-  height="19"
+  height="18"
   left="3"
   mouse_opaque="false"
   name="chiclet_icon"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index ecf149dc76..38d9904d13 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
- height="25"
+ height="23"
  name="script_chiclet"
  width="25">
  <chiclet_script.chiclet_button 
-  height="25"
+  height="23"
   image_selected="PushButton_Selected"
   image_unselected="PushButton_Off"
   name="chiclet_button"
   tab_stop="false"
   width="25"/>
  <chiclet_script.icon
-  bottom="3"
+  bottom="2"
   follows="all"
-  height="19"
+  height="18"
   image_name="Generic_Object_Small"
   left="3"
   mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 4520768216..63166f32b7 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -15,4 +15,6 @@
              background_visible="true"
              heading_height="23"
              draw_border="false"
-             draw_heading="false" />
+             draw_heading="false"
+             border.name="dig border"
+             border.bevel_style="in" />