Commits

Anonymous committed 8933fad Merge
  • Participants
  • Parent commits 66f04e8, cd62f75

Comments (0)

Files changed (130)

indra/newview/skins/default/textures/arrow_keys.png

Removed
Old image

indra/newview/skins/default/textures/bottomtray/Cam_Pan_Over.png

Removed
Old image

indra/newview/skins/default/textures/bottomtray/CameraView_Press.png

Removed
Old image

indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png

Removed
Old image

indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png

Removed
Old image

indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png

Removed
Old image

indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png

Added
New image

indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png

Added
New image

indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png

Added
New image

indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png

Added
New image

indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png

Added
New image

indra/newview/skins/default/textures/checkerboard_transparency_bg.png

Removed
Old image

indra/newview/skins/default/textures/circle.tga

Removed
Old image

indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png

Removed
Old image

indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png

Removed
Old image

indra/newview/skins/default/textures/containers/TabTop_Left_Over.png

Removed
Old image

indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png

Removed
Old image

indra/newview/skins/default/textures/containers/TabTop_Right_Over.png

Removed
Old image

indra/newview/skins/default/textures/icn_label_web.tga

Removed
Old image

indra/newview/skins/default/textures/icn_media.tga

Removed
Old image

indra/newview/skins/default/textures/icn_voice-groupfocus.tga

Removed
Old image

indra/newview/skins/default/textures/icn_voice-localchat.tga

Removed
Old image

indra/newview/skins/default/textures/icn_voice-pvtfocus.tga

Removed
Old image

indra/newview/skins/default/textures/icon_day_cycle.tga

Removed
Old image

indra/newview/skins/default/textures/icon_event_adult.tga

Removed
Old image

indra/newview/skins/default/textures/icon_lock.tga

Removed
Old image

indra/newview/skins/default/textures/icons/AddItem_Over.png

Removed
Old image

indra/newview/skins/default/textures/icons/BackArrow_Over.png

Removed
Old image

indra/newview/skins/default/textures/icons/DragHandle.png

Removed
Old image

indra/newview/skins/default/textures/icons/Generic_Object.png

Removed
Old image

indra/newview/skins/default/textures/icons/Inv_Gift.png

Removed
Old image

indra/newview/skins/default/textures/icons/OptionsMenu_Over.png

Removed
Old image

indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png

Removed
Old image

indra/newview/skins/default/textures/icons/Parcel_Damage_Light_Alt.png

Removed
Old image

indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png

Removed
Old image

indra/newview/skins/default/textures/icons/TrashItem_Over.png

Removed
Old image

indra/newview/skins/default/textures/icons/parcel_color_EVRY.png

Removed
Old image

indra/newview/skins/default/textures/icons/parcel_color_EXP.png

Removed
Old image

indra/newview/skins/default/textures/icons/parcel_color_M.png

Removed
Old image

indra/newview/skins/default/textures/image_edit_icon.tga

Removed
Old image

indra/newview/skins/default/textures/inv_folder_animation.tga

Removed
Old image

indra/newview/skins/default/textures/inv_folder_inbox.tga

Removed
Old image

indra/newview/skins/default/textures/map_avatar_above_8.tga

Removed
Old image

indra/newview/skins/default/textures/map_avatar_below_8.tga

Removed
Old image

indra/newview/skins/default/textures/map_event_adult.tga

Removed
Old image

indra/newview/skins/default/textures/map_event_mature.tga

Removed
Old image

indra/newview/skins/default/textures/map_track_8.tga

Removed
Old image

indra/newview/skins/default/textures/model_wizard/divider_line.png

Removed
Old image

indra/newview/skins/default/textures/mute_icon.tga

Removed
Old image

indra/newview/skins/default/textures/navbar/Arrow_Left_Over.png

Removed
Old image

indra/newview/skins/default/textures/navbar/Arrow_Right_Over.png

Removed
Old image

indra/newview/skins/default/textures/navbar/Help_Over.png

Removed
Old image

indra/newview/skins/default/textures/navbar/Home_Over.png

Removed
Old image

indra/newview/skins/default/textures/places_rating_adult.tga

Removed
Old image

indra/newview/skins/default/textures/places_rating_mature.tga

Removed
Old image

indra/newview/skins/default/textures/places_rating_pg.tga

Removed
Old image

indra/newview/skins/default/textures/propertyline.tga

Removed
Old image

indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/camera_free_mode.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/move_fly_first.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/move_fly_second.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/move_run_first.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/move_run_second.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/move_walk_first.png

Removed
Old image

indra/newview/skins/default/textures/quick_tips/move_walk_second.png

Removed
Old image

indra/newview/skins/default/textures/show_btn.tga

Removed
Old image

indra/newview/skins/default/textures/show_btn_selected.tga

Removed
Old image

indra/newview/skins/default/textures/smicon_warn.tga

Removed
Old image

indra/newview/skins/default/textures/spacer35.tga

Removed
Old image

indra/newview/skins/default/textures/square_btn_32x128.tga

Removed
Old image

indra/newview/skins/default/textures/square_btn_selected_32x128.tga

Removed
Old image

indra/newview/skins/default/textures/startup_logo.j2c

Binary file removed.

indra/newview/skins/default/textures/status_busy.tga

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png

Removed
Old image

indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Selected.png

Removed
Old image

indra/newview/skins/default/textures/textures.xml

   <texture name="Accordion_Over" file_name="containers/Accordion_Over.png" preload="false" />
   <texture name="Accordion_Selected" file_name="containers/Accordion_Selected.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" />
   <texture name="Arrow_Left_Off" file_name="navbar/Arrow_Left_Off.png" preload="true" />
   <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true" />
 
-<!--
--->
-
   <texture name="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" />
   <texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" />
   <texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" />
   <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_UpSelected" file_name="widgets/ComboButton_UpSelected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="ComboButton_Up_On_Selected" file_name="widgets/ComboButton_Up_On_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" />
   <texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" />
 
-  <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
-  <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
-  <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
   <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
   <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" />
-  <texture name="TabIcon_Me_Selected" file_name="taskpanel/TabIcon_Me_Selected.png" preload="false" />
   <texture name="TabIcon_Open_Off" file_name="taskpanel/TabIcon_Open_Off.png" preload="false" />
   <texture name="TabIcon_People_Off" file_name="taskpanel/TabIcon_People_Off.png" preload="false" />
-  <texture name="TabIcon_People_Selected" file_name="taskpanel/TabIcon_People_Selected.png" preload="false" />
-  <texture name="TabIcon_Places_Large" file_name="taskpanel/TabIcon_Places_Large.png" preload="false" />
   <texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="false" />
-  <texture name="TabIcon_Places_Selected" file_name="taskpanel/TabIcon_Places_Selected.png" preload="false" />
   <texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="false" />
-  <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="false" />
 
   <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="VoicePTT_Lvl3" file_name="bottomtray/VoicePTT_Lvl3.png" preload="false" />
   <texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" />
   <texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" />
+  
+  <texture name="VoicePTT_Lvl1_Dark" file_name="bottomtray/VoicePTT_Lvl1_Dark.png" preload="false" />
+  <texture name="VoicePTT_Lvl2_Dark" file_name="bottomtray/VoicePTT_Lvl2_Dark.png" preload="false" />
+  <texture name="VoicePTT_Lvl3_Dark" file_name="bottomtray/VoicePTT_Lvl3_Dark.png" preload="false" />
+  <texture name="VoicePTT_Off_Dark" file_name="bottomtray/VoicePTT_Off_Dark.png" preload="false" />
+  <texture name="VoicePTT_On_Dark" file_name="bottomtray/VoicePTT_On_Dark.png" preload="false" />
 
   <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" />
 
   <!--WARNING OLD ART BELOW *do not use*-->
   <texture name="icn_media_web.tga" preload="true" />
   <texture name="icn_media_movie.tga" preload="true" />
-  <texture name="icn_voice-localchat.tga" />
-  <texture name="icn_voice-groupfocus.tga" />
-  <texture name="icn_voice-pvtfocus.tga" />
 
   <texture name="jump_left_out.tga" file_name="widgets/jump_left_out.png" />
   <texture name="jump_left_in.tga" file_name="widgets/jump_left_in.png" />
 
   <texture name="icon_avatar_offline.tga" />
   <texture name="icon_avatar_online.tga" />
-  <texture name="icon_day_cycle.tga" />
   <texture name="icon_diurnal.tga" />
   <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
   <texture name="icon_top_pick.tga" />
   <texture name="map_avatar_16.tga" />
   <texture name="map_avatar_8.tga" />
   <texture name="map_event.tga" />
-  <texture name="map_event_mature.tga" />
   <texture name="map_home.tga" />
   <texture name="map_infohub.tga" />
   <texture name="map_telehub.tga" />

indra/newview/skins/default/textures/toolbar_icons/mini_map.png

Old
Old image
New
New image

indra/newview/skins/default/textures/widgets/Checkbox_On_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/Checkbox_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ComboButton_Up_On_Selected.png

Removed
Old image

indra/newview/skins/default/textures/widgets/DisclosureArrow_Closed_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/PushButton_On_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/PushButton_Selected_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/RadioButton_On_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/RadioButton_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/ScrollThumb_Vert_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Disabled.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_On_Selected.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_On_Press.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/SliderThumb_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/Stepper_Down_Over.png

Removed
Old image

indra/newview/skins/default/textures/widgets/Stepper_Up_Over.png

Removed
Old image

indra/newview/skins/default/textures/windows/Flyout.png

Removed
Old image

indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png

Removed
Old image

indra/newview/skins/default/textures/windows/Icon_Gear_Over.png

Removed
Old image

indra/newview/skins/default/textures/windows/Icon_Undock_Press.png

Removed
Old image

indra/newview/skins/default/textures/windows/hint_arrow_down.png

Old
Old image
New
New image

indra/newview/skins/default/textures/windows/hint_arrow_up.png

Old
Old image
New
New image

indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml

      tab_stop="false"
      width="25" />
     <chiclet_im_adhoc.speaker
-     auto_update="true"
-     draw_border="false"
-     height="23"
-     left="25"
-     name="speaker"
-     visible="false"
-     width="20" />
+      image_mute="Parcel_VoiceNo_Light"
+      image_off="VoicePTT_Off_Dark"
+      image_on="VoicePTT_On_Dark"
+      image_level_1="VoicePTT_Lvl1_Dark"
+      image_level_2="VoicePTT_Lvl2_Dark"
+      image_level_3="VoicePTT_Lvl3_Dark"
+      auto_update="true"
+      draw_border="false"
+      height="24"
+      left="25"
+      name="speaker"
+      visible="false"
+      width="20" />
     <chiclet_im_adhoc.avatar_icon
      bottom="3"
      follows="left|top|bottom"

indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml

      tab_stop="false"
      width="25" />
     <chiclet_im_group.speaker
-     auto_update="true"
-     draw_border="false"
-     height="25"
-     left="25"
-     name="speaker"
-     visible="false"
-     width="20" />
+      image_mute="Parcel_VoiceNo_Light"
+      image_off="VoicePTT_Off_Dark"
+      image_on="VoicePTT_On_Dark"
+      image_level_1="VoicePTT_Lvl1_Dark"
+      image_level_2="VoicePTT_Lvl2_Dark"
+      image_level_3="VoicePTT_Lvl3_Dark"
+      auto_update="true"
+      draw_border="false"
+      height="24"
+      left="25"
+      name="speaker"
+      visible="false"
+      width="20" />
     <chiclet_im_group.group_icon
      bottom="3"
      default_icon="Generic_Group"

indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml

      tab_stop="false"
      width="25"/>
     <chiclet_im_p2p.speaker
-     auto_update="true"
-     draw_border="false"
-     height="23"
-     left="25"
-     name="speaker"
-     visible="false"
-     width="20" />
+      image_mute="Parcel_VoiceNo_Light"
+      image_off="VoicePTT_Off_Dark"
+      image_on="VoicePTT_On_Dark"
+      image_level_1="VoicePTT_Lvl1_Dark"
+      image_level_2="VoicePTT_Lvl2_Dark"
+      image_level_3="VoicePTT_Lvl3_Dark"
+      auto_update="true"
+      draw_border="false"
+      height="24"
+      left="25"
+      name="speaker"
+      visible="false"
+      width="20" />
     <chiclet_im_p2p.avatar_icon
      bottom="3"
      color="white"

indra/newview/skins/minimal/xui/ru/menu_script_chiclet.xml

-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="ScriptChiclet Menu">
-	<menu_item_call label="Close (TODO: translate to Russian)" name="Close"/>
-</menu>

indra/newview/skins/minimal/xui/tr/menu_script_chiclet.xml

-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="ScriptChiclet Menu">
-	<menu_item_call label="Close (TODO: translate to Turkish)" name="Close"/>
-</menu>

indra/newview/skins/minimal/xui/zh/menu_script_chiclet.xml

-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="ScriptChiclet Menu">
-	<menu_item_call label="Close (TODO: translate to Traditional Chinese)" name="Close"/>
-</menu>