Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/

5 files changed, 174 insertions, 117 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index db473a3f10..f2c676e037 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -7,7 +7,7 @@
   <texture name="Accordion_Off" file_name="containers/Accordion_Off.png" preload="false" />
   <texture name="Accordion_Press" file_name="containers/Accordion_Press.png" preload="false" />
 
- <texture name="Activate_Checkmark" file_name="taskpanel/Activate_Checkmark.png" preload="false" />
+<texture name="Activate_Checkmark" file_name="taskpanel/Activate_Checkmark.png" preload="false" />
 
   <texture name="AddItem_Disabled" file_name="icons/AddItem_Disabled.png" preload="false" />
   <texture name="AddItem_Off" file_name="icons/AddItem_Off.png" preload="false" />
@@ -54,11 +54,6 @@
   <texture name="CameraView_Off" file_name="bottomtray/CameraView_Off.png" preload="false" />
   <texture name="CameraView_Over" file_name="bottomtray/CameraView_Over.png" preload="false" />
 
-  <texture name="CameraPreset_Rear" file_name="camera_presets/camera_presets_rear.png" preload="false" />
-  <texture name="CameraPreset_3_4" file_name="camera_presets/camera_presets_3_4.png" preload="false" />
-  <texture name="CameraPreset_Front" file_name="camera_presets/camera_presets_front.png" preload="false" />
-  <texture name="CameraPreset_Mouselook" file_name="camera_presets/camera_presets_mouselook.png" preload="false" />
-
   <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" />
   <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" />
   <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" />
@@ -93,7 +88,7 @@
   <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
   <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="false" />
 
-  <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" />
+  <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" scale.left="2" scale.top="0" scale.right="2" scale.bottom="0" />
   <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" />
 
   <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
@@ -101,7 +96,6 @@
 
   <texture name="Generic_Group" file_name="icons/Generic_Group.png" preload="false" />
   <texture name="Generic_Group_Large" file_name="icons/Generic_Group_Large.png" preload="false" />
-  <texture name="Generic_Object" file_name="icons/Generic_Object.png" preload="false" />
   <texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" />
   <texture name="Generic_Person_Large" file_name="icons/Generic_Person_Large.png" preload="false" />
 
@@ -230,9 +224,6 @@
   <texture name="NearbyVoice_Lvl3" file_name="bottomtray/NearbyVoice_Lvl3.png" preload="false" />
   <texture name="NearbyVoice_On" file_name="bottomtray/NearbyVoice_On.png" preload="false" />
 
-  <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
-  <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
-
   <texture name="Object_Cone" file_name="build/Object_Cone.png" preload="false" />
   <texture name="Object_Cube" file_name="build/Object_Cube.png" preload="false" />
   <texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" />
@@ -260,42 +251,6 @@
   <texture name="Overhead_M" file_name="world/Overhead_M.png" preload="false" />
   <texture name="Overhead_S" file_name="world/Overhead_S.png" preload="false" />
 
-  <texture name="parcel_drk_Build" file_name="icons/parcel_drk_Build.png" preload="false" />
-  <texture name="parcel_drk_BuildNo" file_name="icons/parcel_drk_BuildNo.png" preload="false" />
-  <texture name="parcel_drk_Damage" file_name="icons/parcel_drk_Damage.png" preload="false" />
-  <texture name="parcel_drk_DamageNo" file_name="icons/parcel_drk_DamageNo.png" preload="false" />
-  <texture name="parcel_drk_Fly" file_name="icons/parcel_drk_Fly.png" preload="false" />
-  <texture name="parcel_drk_FlyNo" file_name="icons/parcel_drk_FlyNo.png" preload="false" />
-  <texture name="parcel_drk_ForSale" file_name="icons/parcel_drk_ForSale.png" preload="false" />
-  <texture name="parcel_drk_ForSaleNo" file_name="icons/parcel_drk_ForSaleNo.png" preload="false" />
-  <texture name="parcel_drk_M" file_name="icons/parcel_drk_M.png" preload="false" />
-  <texture name="parcel_drk_PG" file_name="icons/parcel_drk_PG.png" preload="false" />
-  <texture name="parcel_drk_Push" file_name="icons/parcel_drk_Push.png" preload="false" />
-  <texture name="parcel_drk_PushNo" file_name="icons/parcel_drk_PushNo.png" preload="false" />
-  <texture name="parcel_drk_R" file_name="icons/parcel_drk_R.png" preload="false" />
-  <texture name="parcel_drk_Scripts" file_name="icons/parcel_drk_Scripts.png" preload="false" />
-  <texture name="parcel_drk_ScriptsNo" file_name="icons/parcel_drk_ScriptsNo.png" preload="false" />
-  <texture name="parcel_drk_Voice" file_name="icons/parcel_drk_Voice.png" preload="false" />
-  <texture name="parcel_drk_VoiceNo" file_name="icons/parcel_drk_VoiceNo.png" preload="false" />
-
-  <texture name="parcel_lght_Build" file_name="icons/parcel_lght_Build.png" preload="false" />
-  <texture name="parcel_lght_BuildNo" file_name="icons/parcel_lght_BuildNo.png" preload="false" />
-  <texture name="parcel_lght_Damage" file_name="icons/parcel_lght_Damage.png" preload="false" />
-  <texture name="parcel_lght_DamageNo" file_name="icons/parcel_lght_DamageNo.png" preload="false" />
-  <texture name="parcel_lght_Fly" file_name="icons/parcel_lght_Fly.png" preload="false" />
-  <texture name="parcel_lght_FlyNo" file_name="icons/parcel_lght_FlyNo.png" preload="false" />
-  <texture name="parcel_lght_ForSale" file_name="icons/parcel_lght_ForSale.png" preload="false" />
-  <texture name="parcel_lght_ForSaleNo" file_name="icons/parcel_lght_ForSaleNo.png" preload="false" />
-  <texture name="parcel_lght_M" file_name="icons/parcel_lght_M.png" preload="false" />
-  <texture name="parcel_lght_PG" file_name="icons/parcel_lght_PG.png" preload="false" />
-  <texture name="parcel_lght_Push" file_name="icons/parcel_lght_Push.png" preload="false" />
-  <texture name="parcel_lght_PushNo" file_name="icons/parcel_lght_PushNo.png" preload="false" />
-  <texture name="parcel_lght_R" file_name="icons/parcel_lght_R.png" preload="false" />
-  <texture name="parcel_lght_Scripts" file_name="icons/parcel_lght_Scripts.png" preload="false" />
-  <texture name="parcel_lght_ScriptsNo" file_name="icons/parcel_lght_ScriptsNo.png" preload="false" />
-  <texture name="parcel_lght_Voice" file_name="icons/parcel_lght_Voice.png" preload="false" />
-  <texture name="parcel_lght_VoiceNo" file_name="icons/parcel_lght_VoiceNo.png" preload="false" />
-
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="false" />
   <texture name="Progress_2" file_name="icons/Progress_2.png" preload="false" />
   <texture name="Progress_3" file_name="icons/Progress_3.png" preload="false" />
@@ -483,9 +438,6 @@
 
   <!--WARNING OLD ART *do not use*-->
 
-  <texture name="Banner_ForSale" file_name="Banner_ForSale.png" preload="false" />
-  <texture name="Banner_YouAreHere" file_name="Banner_YouAreHere.png" preload="false" />
-
   <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
   <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
 
@@ -603,6 +555,54 @@
   <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
 
+  <texture name="inv_folder_animation.tga" />
+  <texture name="inv_folder_bodypart.tga" />
+  <texture name="inv_folder_callingcard.tga" />
+  <texture name="inv_folder_clothing.tga" />
+  <texture name="inv_folder_current_outfit.tga" />
+  <texture name="inv_folder_gesture.tga" />
+  <texture name="inv_folder_landmark.tga" />
+  <texture name="inv_folder_lostandfound.tga" />
+  <texture name="inv_folder_my_outfits.tga" />
+  <texture name="inv_folder_notecard.tga" />
+  <texture name="inv_folder_object.tga" />
+  <texture name="inv_folder_outfit.tga" />
+  <texture name="inv_folder_plain_closed.tga" />
+  <texture name="inv_folder_script.tga" />
+  <texture name="inv_folder_snapshot.tga" />
+  <texture name="inv_folder_sound.tga" />
+  <texture name="inv_folder_texture.tga" />
+  <texture name="inv_folder_trash.tga" />
+
+  <texture name="inv_item_animation.tga" />
+  <texture name="inv_item_skin.tga" />
+  <texture name="inv_item_callingcard_offline.tga" />
+  <texture name="inv_item_callingcard_online.tga" />
+  <texture name="inv_item_eyes.tga" />
+  <texture name="inv_item_gesture.tga" />
+  <texture name="inv_item_gloves.tga" />
+  <texture name="inv_item_hair.tga" />
+  <texture name="inv_item_jacket.tga" />
+  <texture name="inv_item_landmark.tga" />
+  <texture name="inv_item_landmark_visited.tga" />
+  <texture name="inv_item_linkitem.tga" />
+  <texture name="inv_item_linkfolder.tga" />
+  <texture name="inv_item_notecard.tga" />
+  <texture name="inv_item_object.tga" />
+  <texture name="inv_item_object_multi.tga" />
+  <texture name="inv_item_pants.tga" />
+  <texture name="inv_item_script.tga" />
+  <texture name="inv_item_shape.tga" />
+  <texture name="inv_item_shirt.tga" />
+  <texture name="inv_item_shoes.tga" />
+  <texture name="inv_item_skirt.tga" />
+  <texture name="inv_item_snapshot.tga" />
+  <texture name="inv_item_socks.tga" />
+  <texture name="inv_item_sound.tga" />
+  <texture name="inv_item_texture.tga" />
+  <texture name="inv_item_underpants.tga" />
+  <texture name="inv_item_undershirt.tga" />
+
   <texture name="lag_status_critical.tga" />
   <texture name="lag_status_good.tga" />
   <texture name="lag_status_warning.tga" />
@@ -621,12 +621,45 @@
 
   <texture name="media_icon.tga" file_name="icn_label_media.tga" />
   <texture name="music_icon.tga" file_name="icn_label_music.tga" />
+  <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
+  <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
 
   <texture name="notify_tip_icon.tga" />
   <texture name="notify_caution_icon.tga" />
   <texture name="notify_next.png" preload="true" />
   <texture name="notify_box_icon.tga" />
 
+  <texture name="object_cone.tga" />
+  <texture name="object_cone_active.tga" />
+  <texture name="object_cube.tga" />
+  <texture name="object_cube_active.tga" />
+  <texture name="object_cylinder.tga" />
+  <texture name="object_cylinder_active.tga" />
+  <texture name="object_grass.tga" />
+  <texture name="object_grass_active.tga" />
+  <texture name="object_hemi_cone.tga" />
+  <texture name="object_hemi_cone_active.tga" />
+  <texture name="object_hemi_cylinder.tga" />
+  <texture name="object_hemi_cylinder_active.tga" />
+  <texture name="object_hemi_sphere.tga" />
+  <texture name="object_hemi_sphere_active.tga" />
+  <texture name="object_prism.tga" />
+  <texture name="object_prism_active.tga" />
+  <texture name="object_pyramid.tga" />
+  <texture name="object_pyramid_active.tga" />
+  <texture name="object_ring.tga" />
+  <texture name="object_ring_active.tga" />
+  <texture name="object_sphere.tga" />
+  <texture name="object_sphere_active.tga" />
+  <texture name="object_tetrahedron.tga" />
+  <texture name="object_tetrahedron_active.tga" />
+  <texture name="object_torus.tga" />
+  <texture name="object_torus_active.tga" />
+  <texture name="object_tree.tga" />
+  <texture name="object_tree_active.tga" />
+  <texture name="object_tube.tga" />
+  <texture name="object_tube_active.tga" />
+
   <texture name="pixiesmall.j2c" use_mips="true" />
   <texture name="script_error.j2c" use_mips="true" />
   <texture name="silhouette.j2c" use_mips="true" />
@@ -642,6 +675,11 @@
   <texture name="status_no_push.tga" />
   <texture name="status_no_scripts.tga" />
 
+  <texture name="tool_dozer.tga" />
+  <texture name="tool_dozer_active.tga" />
+  <texture name="tool_zoom.tga" />
+  <texture name="tool_zoom_active.tga" />
+
   <texture name="icn_active-speakers-dot-lvl0.tga" />
   <texture name="icn_active-speakers-dot-lvl1.tga" />
   <texture name="icn_active-speakers-dot-lvl2.tga" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ac98907199..9aacb8a92c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5837,15 +5837,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
       <button
        index="0"
        name="Keep"
-       text="OK"/>
+       text="Accept"/>
       <button
        index="1"
        name="Discard"
-       text="Cancel"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Block"/>
+       text="No, thanks"/>
     </form>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 00ede1fb2c..26d8304551 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- bevel_style="in"
  bg_alpha_color="0.3 0.3 0.3 0"
- height="140"
+ height="175"
  label="im_panel"
  layout="topleft"
  left="0"
  name="im_panel"
  top="0"
- width="350">
+ width="305">
     <string
      name="message_max_lines_count">
         6
@@ -19,50 +18,52 @@
      bevel_style="in"
      bg_alpha_color="black"
      follows="top"
-     height="30"
+     height="20"
      label="im_header"
      layout="topleft"
      left="5"
      name="im_header"
      top="5"
-     width="340">
+     width="295">
         <avatar_icon
          follows="right"
          height="20"
          image_name="icon_avatar_online.tga"
          layout="topleft"
-         left="5"
+         left="0"
          mouse_opaque="true"
          name="avatar_icon"
-         top="5"
+         top="0"
          width="20" />
         <icon
          follows="right"
          height="20"
          image_name="icon_top_pick.tga"
          layout="topleft"
-         left="5"
+         left="0"
          mouse_opaque="true"
          name="sys_msg_icon"
-         top="5"
+         top="0"
          width="20" />
         <text
          follows="left|right"
-         font="SansSerifBigBold"
+         font="SansSerifBold"
          height="20"
          layout="topleft"
-         left_pad="10"
+         left_pad="5"
          name="user_name"
          text_color="white"
          top="5"
          value="Darth Vader"
-         width="250" />
+         width="295" />
+	 <!-- TIME STAMP -->
         <text
          follows="right"
-         font="SansSerifBig"
+         font="SansSerif"
          height="20"
          layout="topleft"
-         left_pad="10"
+	 halign="right"
+         left="245"
          name="time_box"
          text_color="white"
          top="5"
@@ -71,25 +72,25 @@
     </panel>
     <text
      follows="left|top|bottom|right"
-     height="60"
+     height="86"
      layout="topleft"
      left="10"
      name="message"
      text_color="white"
-     top="40"
+     top="33"
      use_ellipses="true"
      value="MESSAGE"
-     width="330"
+     width="285"
      word_wrap="true"
      max_length="350" />
     <button
      follows="bottom"
-     font="SansSerifBigBold"
+     font="SansSerifBold"
      height="25"
-     label="reply"
+     label="Reply"
      layout="topleft"
-     left="120"
+     left="97"
      name="reply"
-     top="110"
+     top="137"
      width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 9c2829d92d..0d34aa0f08 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -1,37 +1,51 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-  background_opaque="true"
-  background_visible="false"
+  background_opaque="false"
+      border_visible="false"
+  border = "false"
+  border_drop_shadow_visible = "false"
+  drop_shadow_visible = "false"
+  background_visible="true"
   bg_alpha_color="0.3 0.3 0.3 0"
-  height="140"
+  bg_opaque_color="0.3 0.3 0.3 0"
   label="notification_panel"
   layout="topleft"
   left="0"
   name="notification_panel"
   top="0"
-  width="350">
+  	height="10"
+  width="305">
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
   <panel
+      border_visible="false"
+      drop_shadow="false"
+ bevel_style="none"
+ border_style="none"
+  border = "false"
+  border_drop_shadow_visible = "false"
+  drop_shadow_visible = "false"
     background_visible="true"
-    bg_alpha_color="0.3 0.3 0.3 0"
+  bg_alpha_color="0.3 0.3 0.3 0"
+  bg_opaque_color="0.3 0.3 0.3 0"
     follows="left|right|top"
-    height="100"
+    height="10"
     label="info_panel"
     layout="topleft"
     left="0"
     name="info_panel"
     top="0"
-    width="350">
-    <text
+    width="305">
+  <!--  <text
       border_visible="false"
       follows="left|right|top|bottom"
       font="SansSerif"
       height="90"
       layout="topleft"
-      left="45"
+      left="10"
       name="text_box"
       read_only="true"
       text_color="white"
-      top="5"
+      top="10"
       visible="false" 
       width="300"
       wrap="true"/>
@@ -47,40 +61,43 @@
       top="5"
       visible="false"
       width="300"
-      wrap="true"/>
+      wrap="true"/>  -->
     <text_editor
+    	h_pad="0"
+	v_pad="0"
       bg_readonly_color="0.0 0.0 0.0 0"
       border_visible="false"
+	  border = "false"
+	  border_drop_shadow_visible = "false"
+	  drop_shadow_visible = "false"
       embedded_items="false"
       enabled="false"
       follows="left|right|top|bottom"
       font="SansSerif"
-      height="90"
       layout="topleft"
-      left="45"
+      left="10"
       mouse_opaque="false"
       name="text_editor_box"
       read_only="true"
       tab_stop="false"
       text_color="white"
       text_readonly_color="white"
-      top="5"
+      top="10"
       visible="false"
-      width="300"
+      width="285"
       wrap="true"/>
   </panel>
   <panel
-    background_visible="true"
-    bg_alpha_color="0.3 0.3 0.3 0"
+    background_visible="false"
     follows="left|right|bottom"
-    height="40"
     label="control_panel"
     layout="topleft"
     left="0"
+    left_delta="-38"
     name="control_panel"
-    top_pad="0"
-    width="350">
+    top="20">
   </panel>
+  <!--
   <icon
     follows="left|top"
     height="32"
@@ -90,5 +107,5 @@
     mouse_opaque="false"
     name="info_icon"
     top="20"
-    width="32" />
+    width="32" />  -->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 2e500fc2aa..5fe973883c 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -1,41 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
+<!-- All this does is establish the position of the "close" button on the toast. -->
+
 <floater
 	name="toast"
 	title=""
   visible="false"
   layout="topleft"
-	width="350"
-	height="40"
-  left="100"
-  top="500"
+	width="305"
+  left="0"
+  top="0"
   follows="right|bottom" 
-  bevel_style="in"
   can_minimize="false"
   can_tear_off="false"
   can_resize="false"
   can_drag_on_left="false"
   can_close="false"
   can_dock="false"  
+  border_visible = "false"
+  border_drop_shadow_visible = "false"
+  drop_shadow_visible = "false"
+  border = "false"
   >
 
+  <!--
   <text
    visible="false"
    follows="left|top|right|bottom"
    font="SansSerifBold"
-   height="28"
+   height="40"
    layout="topleft"
    left="60"
    name="toast_text"
    word_wrap="true"
    text_color="white"
-   top="10"
+   top="20"
    width="290">
     Toast text;
   </text>
   <icon
-    top="4" 
+    top="20" 
     left="10" 
     width="32" 
     height="32"
@@ -47,24 +52,24 @@
     image_name="notify_tip_icon.tga"
     mouse_opaque="true" 
     name="icon"
-  />
+  />-->
   <button
     layout="topleft"
-    top="-5" 
-    left="335" 
-    width="20" 
-    height="20" 
+    top="-6" 
+    left="293" 
+    width="17" 
+    height="17" 
     follows="top|right"
     visible="false" 
     enabled="true" 
-    mouse_opaque="true" 
+    mouse_opaque="false" 
     name="hide_btn" 
     label="" 
     tab_stop="false"
-    image_unselected="toast_hide_btn.tga" 
-    image_disabled="toast_hide_btn.tga"
-    image_selected="toast_hide_btn.tga" 
-    image_hover_selected="toast_hide_btn.tga"
-    image_disabled_selected="toast_hide_btn.tga"
+    image_unselected="windows/Toast_CloseBtn.png" 
+    image_disabled="windows/Toast_CloseBtn.png"
+    image_selected="windows/Toast_CloseBtn.png" 
+    image_hover_selected="windows/Toast_CloseBtn.png"
+    image_disabled_selected="windows/Toast_CloseBtn.png"
   />
 </floater>