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

1 files changed, 88 insertions, 50 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" />