From 8ca06e7bf37f7e5391e14f74d8404bdc05d683d4 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 8 Feb 2010 08:19:32 -0800
Subject: nearby media pops up on hover

---
 .../skins/default/xui/en/panel_status_bar.xml      | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 5754f67045..77eb9f2a75 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,6 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
+ chrome="true" 
  follows="top|right"
  height="19"
  layout="topleft"
@@ -10,6 +11,7 @@
  mouse_opaque="false"
  name="status"
  top="19"
+ tab_stop="false" 
  width="1000">
     <panel.string
      name="StatBarDaysOfWeek">
@@ -73,7 +75,7 @@
      pad_bottom="2"
      tool_tip="Click to buy more L$"
      top="2"
-     width="71" />
+     width="45" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -86,9 +88,24 @@
      left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="89">
+     width="80">
         24:00 AM PST
     </text>
+    <button
+     follows="right|top"
+     height="15"
+     image_selected="button_anim_play.tga"
+     image_unselected="button_anim_pause.tga"
+     image_pressed="button_anim_pause_selected.tga"
+     image_pressed_selected="button_anim_play_selected.tga"
+     is_toggle="true"
+     left_pad="15"
+     top="2"
+     name="media_toggle_btn"
+     tool_tip="Click to toggle media"
+     width="16" >
+    </button>
+
     <button
      follows="right|top"
      height="15"
@@ -96,7 +113,7 @@
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="18"
+     left_pad="5"
      top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
-- 
cgit v1.2.3


From 1c1ebd0365a115c736f62fadec37e006cbf43f44 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 8 Feb 2010 12:20:47 -0800
Subject: added flyout arrow pointing up

---
 .../skins/default/textures/windows/Flyout_Pointer_Up.png  | Bin 0 -> 260 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png
new file mode 100644
index 0000000000..361fab59e0
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png differ
-- 
cgit v1.2.3


From c680368e19f5be7265e2f15a1f4b626b1600e773 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 10 Feb 2010 14:28:46 -0800
Subject: EXT-5261 EXT-5263 EXT-5265 EXT-5266 EXT-5271 - Reformat NMF and
 enable behavior of media toggle in chrome Review #100
 http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=100

This encompasses the first of the behavioral and structural changes for the Nearby Media Floater and the chrome button at the top of the UI. It includes:
- Removal of the Parcel Media and Parcel Audio UI. Still not in the list yet.
- New More/Less button, which doesn't quite work right (see below)
- Changed icon for UI chrome
- Enabled "turning on" and "turning off" media from the chrome and NMF
- Added gear icon to bring up prefs
- XUI changes to the structure of NMF
- Implementation of the "tentative" autoplay flag

This is basically a checkpoint so that Richard can help with the More/Less implementation
---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 77eb9f2a75..96c61b69f5 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -94,10 +94,10 @@
     <button
      follows="right|top"
      height="15"
-     image_selected="button_anim_play.tga"
-     image_unselected="button_anim_pause.tga"
-     image_pressed="button_anim_pause_selected.tga"
-     image_pressed_selected="button_anim_play_selected.tga"
+     image_selected="Pause_Off"
+     image_unselected="Play_Off"
+     image_pressed="Play_Press"
+     image_pressed_selected="Pause_Press"
      is_toggle="true"
      left_pad="15"
      top="2"
@@ -105,7 +105,6 @@
      tool_tip="Click to toggle media"
      width="16" >
     </button>
-
     <button
      follows="right|top"
      height="15"
-- 
cgit v1.2.3


From 6c5b984bf670e34fd88a8f1a0bdeb1042fa531b2 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 11 Feb 2010 18:06:25 -0800
Subject: converted llfloaternearbymedia to llpanelnearbymedia moved from
 LLTransientDockableFloater model to popup panel model like volume popup

---
 .../skins/default/xui/en/panel_nearby_media.xml    | 501 +++++++++++++++++++++
 1 file changed, 501 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_nearby_media.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
new file mode 100644
index 0000000000..3ff0f127c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	can_resize="true"
+	can_close="false"
+	height="550"
+  background_opaque="true"
+  background_visible="true"
+	layout="topleft"
+	name="nearby_media"
+	help_topic="nearby_media"
+	width="440">
+  <string name="media_item_count_format">(%ld media items)</string>
+  <string name="empty_item_text">&lt;empty&gt;</string>
+  <string name="default_parcel_media_name">&lt;No Media Available&gt;</string>
+  <string name="default_parcel_media_tool_tip">Turn parcel media on/off</string>
+  <panel
+	  bottom="550"
+	  follows="left|top|right|bottom"
+	  left="0"
+	  mouse_opaque="false"
+	  name="nearby_media_panel"
+	  top="0">
+	<panel
+		bevel_style="in"
+		bg_alpha_color="0 0 0 0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|right|top"
+		top="0"
+		height="45"
+		left="0">
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerifBold"
+		  left="10">
+		All Media
+	  </text>
+	  <text
+		  top_delta="0"
+		  type="string"
+		  length="1"
+		  follows="top|right"
+		  font="SansSerif"
+		  name="media_item_count"
+		  left="190">
+		(?? media items)
+	  </text> 
+	  <button
+		  name="all_nearby_media_enable_btn"
+		  top_delta="18"
+		  follows="left"
+		  tool_tip="Turn all nearby media on"
+		  left="15"
+		  width="28"
+		  height="22"
+		  label="On">
+		<button.commit_callback
+			function="MediaListCtrl.EnableAll" />
+	  </button>
+	  <button
+		  name="all_nearby_media_disable_btn"
+		  follows="left"
+		  tool_tip="Turn all nearby media off"
+		  left_pad="4"
+		  width="28"
+		  height="22"
+		  label="Off">
+		<button.commit_callback
+			function="MediaListCtrl.DisableAll" />
+	  </button>
+	  <slider
+		  height="15"
+		  top="27"
+		  left_delta="48"
+		  control_name="AudioLevelMedia"
+		  increment="0.05"
+		  initial_value="0.5"
+		  width="110"
+		  name="all_media_volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="Pref.setControlFalse"
+			parameter="MuteMedia" />
+	  </slider>
+	  <button
+		  control_name="MuteMedia"
+		  height="16"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  is_toggle="true"
+		  left_delta="120"
+		  name="mute_all_media"
+		  tab_stop="false"
+		  top_delta="-1"
+		  width="18" />
+	</panel>
+	<!-- Parcel Media controls -->
+	<text
+		type="string"
+		length="1"
+		follows="left|top|right"
+		font="SansSerif"
+		font.size="Small"
+		top_pad="10"
+		left="40"
+		width="80">
+	  Parcel Media
+	</text>
+	<text
+		name="parcel_media_name"
+		use_ellipses="true"
+		type="string"
+		length="1"
+		follows="top|left|right"
+		font="SansSerif"
+		font.style="ITALIC"
+		font.size="Small"
+		left_pad="10"
+		right="-10">
+	  &lt;No Media Available&gt;
+	</text>
+<!--
+	<panel
+		bevel_style="in"
+		bg_alpha_color="0 0 0 0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|top|right"
+		height="25"
+		left="25"
+		right="-10">
+	  <button
+		  name="parcel_media_enable_btn"
+		  follows="left"
+		  tool_tip="Turn parcel media on"
+		  left="15"
+		  width="28"
+		  height="22"
+		  label="On">
+		<button.commit_callback
+			function="ParcelMediaCtrl.EnableParcelMedia" />
+	  </button>
+	  <button
+		  name="parcel_media_disable_btn"
+		  follows="left"
+		  tool_tip="Turn parcel media off"
+		  left_pad="4"
+		  width="28"
+		  height="22"
+		  label="Off">
+		<button.commit_callback
+			function="ParcelMediaCtrl.DisableParcelMedia" />
+	  </button>
+	</panel>
+-->
+	<panel
+		name="parcel_media_ctrls"
+		bevel_style="in"
+		follows="left|top|right"
+		top_pad="2"
+		height="30"
+		left="0">
+	  <button
+		  name="parcel_media_play_btn"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  tool_tip = "Play parcel media"
+		  left="40"
+		  height="22"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelMediaCtrl.Play" />
+	  </button>
+	  <button
+		  name="parcel_media_pause_btn"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="0"
+		  height="22"
+		  tool_tip = "Pause parcel media">
+		<button.commit_callback
+			function="ParcelMediaCtrl.Pause" />
+	  </button>
+	  <button
+		  name="parcel_media_stop_btn"
+		  image_overlay="Stop_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="25"
+		  height="22"
+		  tool_tip="Stop parcel media"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelMediaCtrl.Stop" />
+	  </button>
+	  <slider
+		  height="15"
+		  top="7"
+		  left="95"
+		  increment="0.05"
+		  initial_value="0.5"
+		  width="110"
+		  name="parcel_media_volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="ParcelMediaCtrl.ParcelMediaVolume"/>
+	  </slider>
+	  <button
+		  height="16"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  is_toggle="true"
+		  left_delta="120"
+		  name="parcel_media_mute"
+		  tab_stop="false"
+		  top_delta="-1"
+		  width="18" >
+		<button.commit_callback
+			function="ParcelMediaCtrl.MuteParcelMedia" />
+	  </button>
+	</panel>
+	<!-- parcel audio -->
+	<panel
+		name="parcel_audio_ctrls"
+		bevel_style="in"
+		follows="left|top|right"
+		top_delta="30"
+		height="40"
+		left="0">
+	  <text
+		  type="string"
+		  length="1"
+		  top="0"
+		  follows="top|left|right"
+		  font="SansSerif"
+		  font.size="Small"
+		  left="40">
+		Parcel Audio
+	  </text>
+	  <button
+		  name="parcel_audio_play_btn"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  tool_tip = "Play parcel audio"
+		  top="15"
+		  left="40"
+		  height="22"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelAudioCtrl.Play" />
+	  </button>
+	  <button
+		  name="parcel_audio_pause_btn"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="0"
+		  height="22"
+		  tool_tip = "Pause parcel audio">
+		<button.commit_callback
+			function="ParcelAudioCtrl.Pause" />
+	  </button>
+	  <button
+		  name="parcel_audio_stop_btn"
+		  image_overlay="Stop_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="25"
+		  height="22"
+		  tool_tip="Stop parcel audio"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelAudioCtrl.Stop" />
+	  </button>
+	  <slider
+		  control_name="AudioLevelMusic"
+		  follows="left|top"
+		  height="15"
+		  increment="0.05"
+		  initial_value="0.5"
+		  left="95"
+		  width="110"
+		  name="Music Volume"
+		  show_text="false"
+		  top_delta="4"
+		  volume="true">
+		<slider.commit_callback
+			function="Pref.setControlFalse"
+			parameter="MuteMusic" />
+	  </slider>
+	  <button
+		  control_name="MuteMusic"
+		  height="16"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  is_toggle="true"
+		  left_delta="120"
+		  name="mute_music"
+		  tab_stop="false"
+		  top_delta="-1"
+		  width="18" />
+	</panel>
+	<panel
+		bevel_style="in"
+		border_style="line"
+		bg_alpha_color="0 0 0 0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|right|top|bottom"
+		top_delta="45"
+		right="-1"
+		left="0"
+		height="265">
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerifBold"
+		  left="10">
+		Nearby Media
+	  </text>
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerif"
+		  font.size="Small"
+		  font.style="ITALIC"
+		  top_pad="8"
+		  left="10">
+		Check to enable/disable media; double-click to zoom view
+	  </text>
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerif"
+		  top_pad="15"
+		  left="10">
+		Show:
+	  </text>
+	  <combo_box
+		  height="23"
+		  left="50"
+		  width="120"
+		  top_delta="-5"
+		  follows="left|right|top"
+		  name="show_combo">
+		<combo_box.item
+			label="All"
+			value="0"
+			name="All" />
+		<combo_box.item
+			label="In this Parcel"
+			value="2"
+			name="WithinParcel" />
+		<combo_box.item
+			label="Outside this Parcel"
+			value="3"
+			name="OutsideParcel" />
+		<combo_box.item
+			label="On other Avatars"
+			value="4"
+			ame="OnOthers" />
+	  </combo_box>
+	  <scroll_list
+		  follows="left|top|bottom|right"
+		  column_padding="0"
+		  height="200"
+		  draw_heading="false"
+		  draw_stripes="true"
+		  bg_stripe_color="0.25 0.25 0.25 0.25"
+		  top_pad="8"
+		  left="10"
+		  right="-10"
+		  name="media_list">
+		<scroll_list.columns
+			type="checkbox"
+			width="20"
+			label=""
+			name="media_checkbox_ctrl" />
+		<scroll_list.columns
+			sort_column="media_proximity"
+			width="-1"
+			label="Proximity"
+			name="media_proximity" />
+		<scroll_list.columns
+			sort_column="media_visibility"
+			width="-1"
+			label="Visible"
+			name="media_visibility" />
+		<scroll_list.columns
+			sort_column="media_class"
+			width="-1"
+			label="Class"
+			name="media_class" />
+		<scroll_list.columns
+			label="Name"
+			name="media_name" />
+		<scroll_list.columns
+			sort_column="media_debug"
+			width="-1"
+			label="Debug"
+			name="media_debug" />
+	  </scroll_list>
+	</panel>
+	<panel
+		bevel_style="in"
+		background_visible="true" 
+		bg_alpha_color="0.0 0.0 0.0 1.0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|right|bottom"
+		top_pad="10"
+		height="110"
+		left="10"
+		right="-10">
+	  <check_box
+		  name="media_enabled_btn"
+		  control_name="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Check this to enable all media"
+		  label="All Media Enabled"
+		  top="10"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_auto_play_btn"
+		  control_name="ParcelMediaAutoPlayEnable"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Check this to let media auto-play if it wants"
+		  label="Allow Media to auto-play"
+		  top_pad="5"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_show_within_parcel_btn"
+		  control_name="MediaShowWithinParcel"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Uncheck this to hide media within the parcel you are standing in"
+		  label="Show media within current parcel"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_show_outside_parcel_btn"
+		  control_name="MediaShowOutsideParcel"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Uncheck this to hide media outside the parcel you are standing in"
+		  label="Show media outside current parcel"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_show_on_others_btn"
+		  control_name="MediaShowOnOthers"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Uncheck this to hide media attached to other avatars nearby"
+		  label="Show media attached to other avatars"
+		  left="10"
+		  width="20"/>
+	</panel>
+  </panel>
+</panel>
-- 
cgit v1.2.3


From 31e08f5a53bdee93d976386f8e40b8531f9dc753 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 11 Feb 2010 19:38:26 -0800
Subject: more/less button sorta working

---
 indra/newview/skins/default/xui/en/panel_nearby_media.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 345946aa56..4fcdb30465 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -85,7 +85,7 @@
 	  top_delta="30"
 		right="-1"
 		left="0"
-	  height="375">
+	  height="230">
 	  <text
 		  type="string"
 		  length="1"
-- 
cgit v1.2.3