From 4916305ce1ea60c969c12d8dc8e573f3ee933c3f Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 1 Dec 2009 18:57:15 -0500
Subject: EXT-3029 : Missing icons for broken item link / broken folder link
 EXT-3024 : Broken links don't show up in inventory

Mocked up some link icons for broken links.  These need to be polished up.
Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory.

--HG--
branch : avatar-pipeline
---
 .../skins/default/textures/icons/Inv_LinkFolder.png       | Bin 0 -> 296 bytes
 .../newview/skins/default/textures/icons/Inv_LinkItem.png | Bin 0 -> 296 bytes
 indra/newview/skins/default/textures/textures.xml         |   2 ++
 3 files changed, 2 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_LinkFolder.png
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_LinkItem.png

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png
new file mode 100644
index 0000000000..73a708782c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkItem.png b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png
new file mode 100644
index 0000000000..73a708782c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7703b9f0ab..93d3205176 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -234,6 +234,8 @@ with the same filename but different name
   <texture name="Inv_Gesture" file_name="icons/Inv_Gesture.png" preload="false" />
   <texture name="Inv_Gloves" file_name="icons/Inv_Gloves.png" preload="false" />
   <texture name="Inv_Hair" file_name="icons/Inv_Hair.png" preload="false" />
+  <texture name="Inv_LinkItem" file_name="icons/Inv_LinkItem.png" preload="false" />
+  <texture name="Inv_LinkFolder" file_name="icons/Inv_LinkFolder.png" preload="false" />
   <texture name="Inv_Jacket" file_name="icons/Inv_Jacket.png" preload="false" />
   <texture name="Inv_LookFolderOpen" file_name="icons/Inv_LookFolderOpen.png" preload="false" />
   <texture name="Inv_LookFolderClosed" file_name="icons/Inv_LookFolderClosed.png" preload="false" />
-- 
cgit v1.2.3


From 99b6b14ea1ea6cf61ff06e8806a1d1a08b4a1420 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 2 Dec 2009 14:23:35 -0500
Subject: EXT-3050 : The Word "bar" Should be Removed from Section Headings on
 My Appearance Tab in Side Bar

--HG--
branch : avatar-pipeline
---
 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index d805209bf5..51997a2813 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -17,7 +17,7 @@
         <accordion_tab
          layout="topleft"
          name="tab_outfits"
-         title="Outfits bar">
+         title="Outfits">
 	 <inventory_panel 
 	 	 allow_multi_select="true" 
 		 border="true" 
@@ -33,7 +33,7 @@
         <accordion_tab
          layout="topleft"
          name="tab_cof"
-         title="Current Outfit bar">
+         title="Current Outfit">
 	 <inventory_panel 
 	 	 allow_multi_select="true" 
 		 border="true" 
-- 
cgit v1.2.3


From 533988ee86d942851a79a2833914033e89a05f4d Mon Sep 17 00:00:00 2001
From: skolb <none@none>
Date: Wed, 2 Dec 2009 18:12:30 -0800
Subject: unify the two media auto play preferences into one.  The
 ParcelMediaAutoPlayEnable flag now controls both (horribly named, but must be
 preserved for legacy purposes).

---
 .../skins/default/xui/en/panel_preferences_privacy.xml        | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 23832ba120..29e9b476eb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -78,7 +78,7 @@
      top_pad="10"
      width="350" />
     <check_box
-     control_name="AutoPlayMedia"
+     control_name="ParcelMediaAutoPlayEnable"
      height="16"
      label="Allow Media Autoplay"
      layout="topleft"
@@ -86,15 +86,6 @@
      name="autoplay_enabled"
      top_pad="10"
      width="350" />
-    <check_box
-     control_name="ParcelMediaAutoPlayEnable"
-     height="16"
-     label="Automatically Play Parcel Media"
-     layout="topleft"
-     left="30"
-     name="parcel_autoplay_enabled"
-     top_pad="10"
-     width="350" />
    <text
       type="string"
     length="1"
-- 
cgit v1.2.3


From 3c69340570cd1cbf2e7172aec905b714341cccbd Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 2 Dec 2009 21:30:41 -0800
Subject: DEV-42827 Implement volume slider on media controls

Introducing a volume slider that pops up when you hover
over the "mute" button.  Fades out with the rest of the
controls.  Had to also render (by hand) the background
image.  Cleaned up the XUI file.
---
 .../default/xui/en/panel_prim_media_controls.xml   | 175 ++++-----------------
 1 file changed, 28 insertions(+), 147 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 8b86067b03..e21de31498 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -3,7 +3,7 @@
 	follows="left|right|top|bottom"
 	name="MediaControls"
 	background_visible="false"
-	height="192"
+	height="200"
 	layout="topleft"
 	mouse_opaque="false"
 	width="800">
@@ -16,20 +16,20 @@
   <string name="zoom_far_padding">1.5</string>
   <panel
 	  name="media_region"
-	  bottom="125"
+	  height="100"
 	  follows="left|right|top|bottom"
 	  layout="topleft"
 	  mouse_opaque="false"
-	  top="20" />
+	  top="0" />
   <layout_stack
 	  name="media_controls"
 	  follows="left|right"
 	  animate="false"
-	  height="26"
+	  height="75"
 	  layout="topleft"
 	  left="0"
 	  orientation="horizontal"
-	  top="128">
+	  top="100">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		name="left_bookend"
@@ -239,19 +239,6 @@
 		layout="topleft"
 		width="190"
 		min_width="90">
-	  <!--
-	  RE-ENABLE THIS WHEN WE HAVE A HISTORY DROP-DOWN AGAIN
-	  <combo_box
-		  name="media_address_url"
-		  allow_text_entry="true"
-		  height="22"
-		  layout="topleft"
-		  max_chars="1024"
-		  tool_tip = "Media URL">
-		<combo_box.commit_callback
-			function="MediaCtrl.CommitURL" />
-	  </combo_box>
-	  -->
 	  <line_editor 
 		  name="media_address_url"
 		  follows="left|right" 
@@ -314,8 +301,9 @@
 	  <slider_bar
 		  name="media_play_slider"
 		  follows="left|right|top"
-		  height="16"
-		  increment="0.05"
+		  height="20"
+		  bottom="88"
+		  increment="0.01"
 		  initial_value="0.5"
 		  layout="topleft"
 		  tool_tip="Movie play progress"
@@ -379,7 +367,8 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		height="22"
+		top="-50"
+		height="72"
 		min_width="22"
 		width="22">
 	  <!-- Note: this is not quite right either...the mute button is not the -->
@@ -397,138 +386,30 @@
 		  layout="topleft"
 		  scale_image="false" 
 		  tool_tip="Mute This Media"
-		  top_delta="18"
+		  top="118"
 		  min_width="22"
 		  width="22" >
 		<button.commit_callback
 			function="MediaCtrl.ToggleMute" />
+		<button.mouseenter_callback
+			function="MediaCtrl.ShowVolumeSlider" />
 	  </button>
-	</layout_panel>
-	<!-- We do not have a design yet for "volume", so this is a temporary -->
-	<!-- solution.  See DEV-42827. -->
-	<layout_panel
-		name="volume_up"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		min_width="14"
-		height="14"
-		width="14">
-	  <button
-		  image_overlay="media_btn_scrollup.png"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  top="-5"
-		  height="14"
-		  layout="topleft"
-		  tool_tip="Volume up"
-		  scale_image="true"
-		  min_width="14"
-		  width="14" >
-		<button.commit_callback
-			function="MediaCtrl.CommitVolumeUp" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="volume_down"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		min_width="14"
-		height="14"
-		width="14">
-	  <button
-		  image_overlay="media_btn_scrolldown.png"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip="Volume down"
-		  scale_image="true"
-		  top="-5"
-		  height="14"
-		  min_width="14"
-		  width="14">
-		<button.commit_callback
-			function="MediaCtrl.CommitVolumeDown" />
-	  </button>
-	</layout_panel>
-	<!-- Scroll pad -->
-	<!-- This was removed from the design, but is still here because it is --> 
-	<!-- complex, and recreating it would be hard.  In case the design -->
-	<!-- changes, here it lies: --> 
-	<!--
-	<layout_panel
-		name="media_panel_scroll"
-		auto_resize="false"
-		user_resize="false"
-		height="32"
-		follows="left|right|top|bottom"
-		layout="topleft"
-		min_width="32"
-		width="32">
-	  <icon
-		  height="32"
-		  image_name="media_panel_scrollbg.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="32"
-		  width="32" />
-	  <button
-		  name="scrollup"
-		  height="8"
-		  image_selected="media_btn_scrollup.png"
-		  image_unselected="media_btn_scrollup.png"
-		  layout="topleft"
-		  tool_tip="Scroll up"
-		  scale_image="false"
-		  left="12"
-		  top_delta="4"
-		  min_width="8"
-		  width="8" />
-	  <button
-		  name="scrollleft"
-		  height="8"
-		  image_selected="media_btn_scrollleft.png"
-		  image_unselected="media_btn_scrollleft.png"
-		  layout="topleft"
-		  left="3"
-		  tool_tip="Scroll left"
-		  scale_image="false"
-		  top="12"
-		  min_width="8"
-		  width="8" />
-	  <button
-		  name="scrollright"
-		  height="8"
-		  image_selected="media_btn_scrollright.png"
-		  image_unselected="media_btn_scrollright.png"
-		  layout="topleft"
-		  left_pad="9"
-		  tool_tip="Scroll right"
-		  scale_image="false"
-		  top_delta="0"
-		  min_width="8"
-		  width="8" />
-	  <button
-		  name="scrolldown"
-		  height="8"
-		  image_selected="media_btn_scrolldown.png"
-		  image_unselected="media_btn_scrolldown.png"
+	  <slider
+		  orientation="vertical"
+		  left="0"
+		  top="-2"
+		  height="50"
 		  layout="topleft"
-		  left="12"
-		  tool_tip="Scroll down"
-		  scale_image="false"
-		  top="20"
-		  min_width="8"
-		  width="8" />
+		  increment="0.01"
+		  initial_value="0.5"
+		  name="volume_slider"
+		  tool_tip="Media Volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="MediaCtrl.Volume"/>
+	  </slider>
 	</layout_panel>
-	-->
 	<panel
 		height="28"
 		layout="topleft"
@@ -628,7 +509,7 @@
 	  animate="false"
 	  left="0"
 	  orientation="horizontal"
-	  top="150">
+	  top="170">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		width="0"
-- 
cgit v1.2.3


From a5c5a6598c530f968bf5ed45a03d8ddd23abef9c Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Thu, 3 Dec 2009 12:07:18 -0800
Subject: Un-threaded LLTextureFetch to address potential performance and edge
 case crash issues. Changed an assert to an llerrs with extra info Added "HTTP
 Textures" to "Develop" menu

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ae8a1599a9..37136af680 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3268,6 +3268,17 @@
         </menu>
         <menu_item_separator
          layout="topleft" />
+        <menu_item_check
+         label="HTTP Textures"
+         layout="topleft"
+         name="HTTP Textures">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="ImagePipelineUseHTTP" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="ImagePipelineUseHTTP" />
+        </menu_item_check>
         <menu_item_call
          label="Compress Images"
          layout="topleft"
-- 
cgit v1.2.3