From b8a46c81eefc3da66fc1a1c3ed9bfbf4418b535d Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Fri, 5 Feb 2010 12:06:57 -0800
Subject: Media classes + A step toward restructuring Nearby Media floater

Several changes here:
- Implemented support for "media classification": see http://docs.google.com/a/lindenlab.com/View?id=ddznhrqn_29vhnr2pg8
- Added settings for auto-playing of said classifications
Nearby Media Floater:
- On/Off buttons are now explicit...no more power buttons
- Parcel Media and Parcel Audio are "lighter weight", with no more on/off
- List now sorts with playing items at top, non-playing below
- There is now a "Show" drop-down that filters the list by classification
- Added checkboxes to the bottom to control auto-play settings

More work is needed, so consider this a checkpoint
---
 indra/newview/llviewermedia.cpp | 148 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 9ced0194a2..90fb76c715 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -50,6 +50,9 @@
 #include "llcallbacklist.h"
 #include "llparcel.h"
 #include "llaudioengine.h"  // for gAudiop
+#include "llvoavatar.h"
+#include "llvoavatarself.h"
+#include "llviewerregion.h"
 
 #include "llevent.h"		// LLSimpleListener
 #include "llnotificationsutil.h"
@@ -62,6 +65,10 @@
 #include <boost/signals2.hpp>
 
 /*static*/ const char* LLViewerMedia::AUTO_PLAY_MEDIA_SETTING = "ParcelMediaAutoPlayEnable";
+/*static*/ const char* LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING = "MediaShowOnOthers";
+/*static*/ const char* LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING = "MediaShowWithinParcel";
+/*static*/ const char* LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING = "MediaShowOutsideParcel";
+
 
 // Move this to its own file.
 
@@ -365,8 +372,7 @@ viewer_media_t LLViewerMedia::updateMediaImpl(LLMediaEntry* media_entry, const s
 			// The current media URL is not empty.
 			// If (the media was already loaded OR the media was set to autoplay) AND this update didn't come from this agent,
 			// do a navigate.
-			bool auto_play = (media_impl->mMediaAutoPlay && gSavedSettings.getBOOL(AUTO_PLAY_MEDIA_SETTING));
-			
+			bool auto_play = media_impl->isAutoPlayable();			
 			if((was_loaded || auto_play) && !update_from_self)
 			{
 				needs_navigate = url_changed;
@@ -390,7 +396,7 @@ viewer_media_t LLViewerMedia::updateMediaImpl(LLMediaEntry* media_entry, const s
 		media_impl->mMediaAutoPlay = media_entry->getAutoPlay();
 		media_impl->mMediaEntryURL = media_entry->getCurrentURL();
 		
-		if(media_impl->mMediaAutoPlay && gSavedSettings.getBOOL(AUTO_PLAY_MEDIA_SETTING))
+		if(media_impl->isAutoPlayable())
 		{
 			needs_navigate = true;
 		}
@@ -818,7 +824,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 			
 			impl_count_total++;
 		}
-		
+
 		// Overrides if the window is minimized or we lost focus (taking care
 		// not to accidentally "raise" the priority either)
 		if (!gViewerWindow->getActive() /* viewer window minimized? */ 
@@ -846,7 +852,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 				}
 			}
 		}
-		
+					
 		pimpl->setPriority(new_priority);
 		
 		if(pimpl->getUsedInUI())
@@ -940,6 +946,7 @@ bool LLViewerMedia::firstRunCallback(const LLSD& notification, const LLSD& respo
 	{
 		// user has elected to automatically play media.
 		gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, TRUE);
+		// XXX TODO: what to do about other AUTO_PLAY settings?
 		gSavedSettings.setBOOL("AudioStreamingMusic", TRUE);
 		gSavedSettings.setBOOL("AudioStreamingMedia", TRUE);
 
@@ -959,6 +966,7 @@ bool LLViewerMedia::firstRunCallback(const LLSD& notification, const LLSD& respo
 	else
 	{
 		gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, FALSE);
+		// XXX TODO: what to do about other AUTO_PLAY settings?
 		gSavedSettings.setBOOL("AudioStreamingMedia", FALSE);
 		gSavedSettings.setBOOL("AudioStreamingMusic", FALSE);
 	}
@@ -2111,6 +2119,21 @@ void LLViewerMediaImpl::scaleMouse(S32 *mouse_x, S32 *mouse_y)
 #endif
 }
 
+
+
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::isMediaTimeBased()
+{
+	bool result = false;
+	
+	if(mMediaSource)
+	{
+		result = mMediaSource->pluginSupportsMediaTime();
+	}
+	
+	return result;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 bool LLViewerMediaImpl::isMediaPlaying()
 {
@@ -2172,7 +2195,7 @@ void LLViewerMediaImpl::setDisabled(bool disabled)
 		else
 		{
 			// We just (re)enabled this media.  Do a navigate if auto-play is in order.
-			if(mMediaAutoPlay && gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING))
+			if(isAutoPlayable())
 			{
 				navigateTo(mMediaEntryURL, "", true, true);
 			}
@@ -2199,6 +2222,12 @@ bool LLViewerMediaImpl::isForcedUnloaded() const
 		}
 	}
 	
+	// If this media's class is not supposed to be shown, unload
+	if (!shouldShowBasedOnClass())
+	{
+		return true;
+	}
+	
 	return false;
 }
 
@@ -2684,3 +2713,110 @@ void LLViewerMediaImpl::setTextureID(LLUUID id)
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+bool LLViewerMediaImpl::isAutoPlayable() const
+{
+	return (mMediaAutoPlay && gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING));
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+bool LLViewerMediaImpl::shouldShowBasedOnClass() const
+{
+	// If this is parcel media or in the UI, return true always
+	if (getUsedInUI() || isParcelMedia()) return true;
+	
+	bool attached_to_another_avatar = isAttachedToAnotherAvatar();
+	bool inside_parcel = isInAgentParcel();
+	
+	//	llinfos << " hasFocus = " << hasFocus() <<
+	//	" others = " << (attached_to_another_avatar && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING)) <<
+	//	" within = " << (inside_parcel && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING)) <<
+	//	" outside = " << (!inside_parcel && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING)) << llendl;
+	
+	// If it has focus, we should show it
+	if (hasFocus())
+		return true;
+	
+	// If it is attached to an avatar and the pref is off, we shouldn't show it
+	if (attached_to_another_avatar)
+		return gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING);
+	
+	if (inside_parcel)
+		return gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING);
+	else 
+		return gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+bool LLViewerMediaImpl::isAttachedToAnotherAvatar() const
+{
+	bool result = false;
+	
+	std::list< LLVOVolume* >::const_iterator iter = mObjectList.begin();
+	std::list< LLVOVolume* >::const_iterator end = mObjectList.end();
+	for ( ; iter != end; iter++)
+	{
+		if (isObjectAttachedToAnotherAvatar(*iter))
+		{
+			result = true;
+			break;
+		}
+	}
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+//static
+bool LLViewerMediaImpl::isObjectAttachedToAnotherAvatar(LLVOVolume *obj)
+{
+	bool result = false;
+	LLXform *xform = obj;
+	// Walk up parent chain
+	while (NULL != xform)
+	{
+		LLViewerObject *object = dynamic_cast<LLViewerObject*> (xform);
+		if (NULL != object)
+		{
+			LLVOAvatar *avatar = object->asAvatar();
+			if (NULL != avatar && avatar != gAgent.getAvatarObject())
+			{
+				result = true;
+				break;
+			}
+		}
+		xform = xform->getParent();
+	}
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+bool LLViewerMediaImpl::isInAgentParcel() const
+{
+	bool result = false;
+	
+	std::list< LLVOVolume* >::const_iterator iter = mObjectList.begin();
+	std::list< LLVOVolume* >::const_iterator end = mObjectList.end();
+	for ( ; iter != end; iter++)
+	{
+		LLVOVolume *object = *iter;
+		if (LLViewerMediaImpl::isObjectInAgentParcel(object))
+		{
+			result = true;
+			break;
+		}
+	}
+	return result;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+// static
+bool LLViewerMediaImpl::isObjectInAgentParcel(LLVOVolume *obj)
+{
+	return (LLViewerParcelMgr::getInstance()->inAgentParcel(obj->getPositionGlobal()));
+}
-- 
cgit v1.3


From 3aa7e1b0c10fcb660cfc13308dd2a45223696e11 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Tue, 9 Feb 2010 13:47:13 -0800
Subject: PARTIAL EXT-5261: add new "MediaTentativeAutoPlay" setting

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llviewermedia.cpp         |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 40ac49597d..02b34df4c6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4611,6 +4611,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>MediaTentativeAutoPlay</key>
+  <map>
+    <key>Comment</key>
+    <string>This is a tentative flag that may be temporarily set off by the user, until she teleports</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>MemoryLogFrequency</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index e77106bb2c..3063341ade 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2663,7 +2663,9 @@ void LLViewerMediaImpl::setTextureID(LLUUID id)
 //
 bool LLViewerMediaImpl::isAutoPlayable() const
 {
-	return (mMediaAutoPlay && gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING));
+	return (mMediaAutoPlay && 
+			gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
+			gSavedSettings.getBOOL("MediaTentativeAutoPlay"));
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.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/llagent.cpp                          |  5 +++
 indra/newview/llfloateruipreview.cpp               |  1 -
 indra/newview/llstatusbar.cpp                      | 16 ++++++-
 indra/newview/llstatusbar.h                        |  4 ++
 indra/newview/llviewermedia.cpp                    | 50 +++++++++++++++++++++-
 indra/newview/llviewermedia.h                      |  5 +++
 .../skins/default/xui/en/panel_status_bar.xml      |  9 ++--
 7 files changed, 80 insertions(+), 10 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 2354323a66..f1eb942b52 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5981,6 +5981,11 @@ bool LLAgent::teleportCore(bool is_local)
 	// This was breaking the case of teleporting within a single sim.  Backing it out for now.
 //	gVoiceClient->leaveChannel();
 	
+	// Clear the "tentative" autoplay flag (i.e. set it to true)
+	// XXX: Do we also want to re-enable all media, because we might teleport
+	// somewhere where that media would still exist?   
+	gSavedSettings.setBOOL("MediaTentativeAutoPlay", true);
+	
 	return true;
 }
 
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 3e804bef9d..81dafea018 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -362,7 +362,6 @@ BOOL LLFadeEventTimer::tick()
 
 	if(NULL == mParent)	// no more need to tick, so suicide
 	{
-		delete this;
 		return FALSE;
 	}
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index a2648e4c3a..48de23fab1 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -61,6 +61,7 @@
 #include "llresmgr.h"
 #include "llworld.h"
 #include "llstatgraph.h"
+#include "llviewermedia.h"
 #include "llviewermenu.h"	// for gMenuBarView
 #include "llviewerparcelmgr.h"
 #include "llviewerthrottle.h"
@@ -188,8 +189,9 @@ BOOL LLStatusBar::postBuild()
 	mBtnVolume->setClickedCallback( onClickVolume, this );
 	mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
 
-	LLButton* media_toggle = getChild<LLButton>("media_toggle_btn");
-	media_toggle->setMouseEnterCallback(boost::bind(&LLFloaterReg::showInstance, "nearby_media", LLSD(), true));
+	mMediaToggle = getChild<LLButton>("media_toggle_btn");
+	mMediaToggle->setClickedCallback( &LLStatusBar::onClickMediaToggle, this );
+	mMediaToggle->setMouseEnterCallback(boost::bind(&LLFloaterReg::showInstance, "nearby_media", LLSD(), true));
 
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
 
@@ -354,6 +356,8 @@ void LLStatusBar::refresh()
 	// update the master volume button state
 	bool mute_audio = LLAppViewer::instance()->getMasterSystemAudioMute();
 	mBtnVolume->setToggleState(mute_audio);
+	
+	mMediaToggle->setValue(!LLViewerMedia::isAnyMediaShowing());
 }
 
 void LLStatusBar::setVisibleForMouselook(bool visible)
@@ -525,6 +529,14 @@ static void onClickVolume(void* data)
 	LLAppViewer::instance()->setMasterSystemAudioMute(!mute_audio);	
 }
 
+//static 
+void LLStatusBar::onClickMediaToggle(void* data)
+{
+	LLStatusBar *status_bar = (LLStatusBar*)data;
+	// "Selected" means it was showing the "play" icon (so media was playing), and now it shows "pause", so turn off media
+	LLViewerMedia::setAllMediaEnabled(! status_bar->mMediaToggle->getValue());
+}
+
 // sets the static variables necessary for the date
 void LLStatusBar::setupDate()
 {
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 21a98dd753..9532bbbd22 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -87,6 +87,7 @@ public:
 	S32 getSquareMetersCommitted() const;
 	S32 getSquareMetersLeft() const;
 
+ 	
 private:
 	// simple method to setup the part that holds the date
 	void setupDate();
@@ -96,6 +97,8 @@ private:
 
 	static void onMouseEnterVolume(LLUICtrl* ctrl);
 	static void onClickStatGraph(void* data);
+	
+	static void onClickMediaToggle(void* data);
 
 private:
 	LLTextBox	*mTextHealth;
@@ -105,6 +108,7 @@ private:
 	LLStatGraph *mSGPacketLoss;
 
 	LLButton	*mBtnVolume;
+	LLButton	*mMediaToggle;
 
 	S32				mBalance;
 	S32				mHealth;
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 3063341ade..c4f2f0eed7 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -261,6 +261,7 @@ static LLTimer sMediaCreateTimer;
 static const F32 LLVIEWERMEDIA_CREATE_DELAY = 1.0f;
 static F32 sGlobalVolume = 1.0f;
 static F64 sLowestLoadableImplInterest = 0.0f;
+static bool sAnyMediaShowing = false;
 
 //////////////////////////////////////////////////////////////////////////////////////////
 static void add_media_impl(LLViewerMediaImpl* media)
@@ -694,6 +695,7 @@ static bool proximity_comparitor(const LLViewerMediaImpl* i1, const LLViewerMedi
 // static
 void LLViewerMedia::updateMedia(void *dummy_arg)
 {
+	sAnyMediaShowing = false;
 	impl_list::iterator iter = sViewerMediaImplList.begin();
 	impl_list::iterator end = sViewerMediaImplList.end();
 
@@ -860,6 +862,25 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 		}
 
 		total_cpu += pimpl->getCPUUsage();
+		
+		if (!pimpl->getUsedInUI())
+		{
+			if (! pimpl->isParcelMedia())
+			{
+				if (pimpl->hasMedia())
+				{
+					sAnyMediaShowing = true;
+				}
+			}
+			else {
+				// Parcel media showing?
+				if (!LLViewerParcelMedia::getURL().empty() && LLViewerParcelMedia::getParcelMedia().notNull())
+				{
+					sAnyMediaShowing = true;
+				}
+			}
+		}
+
 	}
 
 	// Re-calculate this every time.
@@ -899,6 +920,33 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::isAnyMediaShowing()
+{
+	return sAnyMediaShowing;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::setAllMediaEnabled(bool val)
+{
+	// Set "tentative" autoplay first.  We need to do this here or else
+	// re-enabling won't start up the media below.
+	gSavedSettings.setBOOL("MediaTentativeAutoPlay", val);
+	
+	// Then 
+	impl_list::iterator iter = sViewerMediaImplList.begin();
+	impl_list::iterator end = sViewerMediaImplList.end();
+	
+	for(; iter != end; iter++)
+	{
+		LLViewerMediaImpl* pimpl = *iter;
+		if (!pimpl->getUsedInUI()) 
+			pimpl->setDisabled(!val);
+	}
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 void LLViewerMedia::initClass()
@@ -913,8 +961,6 @@ void LLViewerMedia::cleanupClass()
 	gIdleCallbacks.deleteFunction(LLViewerMedia::updateMedia, NULL);
 }
 
-		// XXX TODO: what to do about other AUTO_PLAY settings?
-		// XXX TODO: what to do about other AUTO_PLAY settings?
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLViewerMediaImpl
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index b6aaca8cfa..c9e9017e5a 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -102,6 +102,11 @@ class LLViewerMedia
 		static bool textureHasMedia(const LLUUID& texture_id);
 		static void setVolume(F32 volume);
 
+		// Is any media currently "showing"?  Includes Parcel Media.  Does not include media in the UI.
+		static bool isAnyMediaShowing();
+		// Set all media enabled or disabled, depending on val.   Does not include media in the UI.
+		static void setAllMediaEnabled(bool val);
+	
 		static void updateMedia(void* dummy_arg = NULL);
 
 		static void initClass();
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.3


From 234f5a48a70d92e00aded1003814b2b883fa5ef4 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 10 Feb 2010 17:31:46 -0800
Subject: Code review feedback: add comments, move teleport hook to a callback
 in llviewermedia Review #100

---
 indra/newview/llagent.cpp       |  5 -----
 indra/newview/llviewermedia.cpp | 18 +++++++++++++++++-
 indra/newview/llviewermedia.h   |  4 +++-
 3 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index f1eb942b52..2354323a66 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5981,11 +5981,6 @@ bool LLAgent::teleportCore(bool is_local)
 	// This was breaking the case of teleporting within a single sim.  Backing it out for now.
 //	gVoiceClient->leaveChannel();
 	
-	// Clear the "tentative" autoplay flag (i.e. set it to true)
-	// XXX: Do we also want to re-enable all media, because we might teleport
-	// somewhere where that media would still exist?   
-	gSavedSettings.setBOOL("MediaTentativeAutoPlay", true);
-	
 	return true;
 }
 
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index c4f2f0eed7..1b6236ce4a 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -262,6 +262,7 @@ static const F32 LLVIEWERMEDIA_CREATE_DELAY = 1.0f;
 static F32 sGlobalVolume = 1.0f;
 static F64 sLowestLoadableImplInterest = 0.0f;
 static bool sAnyMediaShowing = false;
+static boost::signals2::connection sTeleportFinishConnection;
 
 //////////////////////////////////////////////////////////////////////////////////////////
 static void add_media_impl(LLViewerMediaImpl* media)
@@ -863,6 +864,10 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 
 		total_cpu += pimpl->getCPUUsage();
 		
+		// Only set sAnyMedia​Showing if it isn't used in the UI. If it isn't 
+		// parcel media, do the normal "hasMedia()" check. If it is parcel media, 
+		// hasMedia() seems to always be true, so we do some other checks to see 
+		// if there actually is parcel media  showing
 		if (!pimpl->getUsedInUI())
 		{
 			if (! pimpl->isParcelMedia())
@@ -951,7 +956,9 @@ void LLViewerMedia::setAllMediaEnabled(bool val)
 // static
 void LLViewerMedia::initClass()
 {
-	gIdleCallbacks.addFunction(LLViewerMedia::updateMedia, NULL);
+	gIdleCallbacks.addFunction(LLViewerMedia::updateMedia, NULL);	
+	sTeleportFinishConnection = LLViewerParcelMgr::getInstance()->
+		setTeleportFinishedCallback(boost::bind(&LLViewerMedia::onTeleportFinished));
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -959,6 +966,15 @@ void LLViewerMedia::initClass()
 void LLViewerMedia::cleanupClass()
 {
 	gIdleCallbacks.deleteFunction(LLViewerMedia::updateMedia, NULL);
+	sTeleportFinishConnection.disconnect();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::onTeleportFinished()
+{
+	// On teleport, clear this setting (i.e. set it to true)
+	gSavedSettings.setBOOL("MediaTentativeAutoPlay", true);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index c9e9017e5a..b90f64adc0 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -124,7 +124,9 @@ class LLViewerMedia
 		
 		// This is the comparitor used to sort the list.
 		static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2);
-		
+	
+	private:
+		static void onTeleportFinished();
 };
 
 // Implementation functions not exported into header file
-- 
cgit v1.3


From ffd962f3a3eafd7b65f90039a5bb04dccb0205bc Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Fri, 12 Feb 2010 13:38:17 -0800
Subject: EXT-5267 EXT-5268: Add Parcel Media and Parcel Audio items to nearby
 media panel Review #109

This (fairly major) change adds new "items" to the media list for
Parcel Media and Parcel Audio. Since these items are special (before
the items were always MoaP impls), they had to be treated
special. Moreover, actions on all of "media" had to be centralized so
that they would have similar behavior.
---
 indra/llaudio/llaudioengine.cpp                    |   6 +-
 indra/llaudio/llaudioengine.h                      |  11 +-
 indra/newview/llpanelnearbymedia.cpp               | 508 ++++++++++++---------
 indra/newview/llpanelnearbymedia.h                 |  29 +-
 indra/newview/llstatusbar.cpp                      |  14 +-
 indra/newview/llviewermedia.cpp                    |  98 +++-
 indra/newview/llviewermedia.h                      | 114 ++---
 .../skins/default/xui/en/panel_nearby_media.xml    | 131 +++---
 8 files changed, 532 insertions(+), 379 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index a28c94d00d..ed06c85e1a 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -202,12 +202,12 @@ void LLAudioEngine::updateInternetStream()
 }
 
 // virtual
-int LLAudioEngine::isInternetStreamPlaying()
+LLAudioEngine::LLAudioPlayState LLAudioEngine::isInternetStreamPlaying()
 {
 	if (mStreamingAudioImpl)
-		return mStreamingAudioImpl->isPlaying();
+		return (LLAudioEngine::LLAudioPlayState) mStreamingAudioImpl->isPlaying();
 
-	return 0; // Stopped
+	return LLAudioEngine::AUDIO_STOPPED; // Stopped
 }
 
 
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index 457fd93abe..d287104204 100644
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -91,6 +91,15 @@ public:
 		AUDIO_TYPE_COUNT   = 4 // last
 	};
 	
+	enum LLAudioPlayState
+	{
+		// isInternetStreamPlaying() returns an *int*, with
+		// 0 = stopped, 1 = playing, 2 = paused.
+		AUDIO_STOPPED = 0,
+		AUDIO_PLAYING = 1,
+		AUDIO_PAUSED = 2
+	};
+	
 	LLAudioEngine();
 	virtual ~LLAudioEngine();
 
@@ -156,7 +165,7 @@ public:
 	void stopInternetStream();
 	void pauseInternetStream(int pause);
 	void updateInternetStream(); // expected to be called often
-	int isInternetStreamPlaying();
+	LLAudioPlayState isInternetStreamPlaying();
 	// use a value from 0.0 to 1.0, inclusive
 	void setInternetStreamGain(F32 vol);
 	std::string getInternetStreamURL();
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index a4da194a20..35ba0d2347 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -64,11 +64,8 @@
 
 extern LLControlGroup gSavedSettings;
 
-// Ugh, isInternetStreamPlaying() returns not a bool, but an *int*, with
-// 0 = stopped, 1 = playing, 2 = paused.
-static const int PARCEL_AUDIO_STOPPED = 0;
-static const int PARCEL_AUDIO_PLAYING = 1;
-static const int PARCEL_AUDIO_PAUSED = 2;
+static const LLUUID PARCEL_MEDIA_LIST_ITEM_UUID = LLUUID("CAB5920F-E484-4233-8621-384CF373A321");
+static const LLUUID PARCEL_AUDIO_LIST_ITEM_UUID = LLUUID("DF4B020D-8A24-4B95-AB5D-CA970D694822");
 
 //
 // LLPanelNearByMedia
@@ -79,7 +76,9 @@ LLPanelNearByMedia::LLPanelNearByMedia()
 	  mEnableAllCtrl(NULL),
 	  mEnableParcelMediaCtrl(NULL),	  
 	  mAllMediaDisabled(false),
-	  mDebugInfoVisible(false)
+	  mDebugInfoVisible(false),
+	  mParcelMediaItem(NULL),
+	  mParcelAudioItem(NULL)
 {
 	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING);
 
@@ -116,7 +115,6 @@ BOOL LLPanelNearByMedia::postBuild()
 	mParcelMediaMuteCtrl = getChild<LLButton>("parcel_media_mute");
 	mEnableParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_enable_btn");
 	mDisableParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_disable_btn");
-	mParcelMediaText = getChild<LLTextBox>("parcel_media_name");
 	mItemCountText = getChild<LLTextBox>("media_item_count");
 	mParcelMediaPlayCtrl = getChild<LLButton>("parcel_media_play_btn");
 	mParcelMediaPauseCtrl = getChild<LLButton>("parcel_media_pause_btn");
@@ -127,20 +125,13 @@ BOOL LLPanelNearByMedia::postBuild()
 	mShowCtrl = getChild<LLComboBox>("show_combo");
 	
 	mEmptyNameString = getString("empty_item_text");
-	mDefaultParcelMediaName = getString("default_parcel_media_name");
+	mParcelMediaName = getString("parcel_media_name");
+	mParcelAudioName = getString("parcel_audio_name");
 	mPlayingString = getString("playing_suffix");
 	
 	mMediaList->setDoubleClickCallback(onZoomMedia, this);
 	mMediaList->sortByColumnIndex(PROXIMITY_COLUMN, TRUE);
 	mMediaList->sortByColumnIndex(VISIBILITY_COLUMN, FALSE);
-
-	std::string url = LLViewerParcelMedia::getURL();
-	if (!url.empty())
-	{
-		std::string name = LLViewerParcelMedia::getName();
-		mParcelMediaText->setValue(name.empty()?url:name);
-		mParcelMediaText->setToolTip(url);	
-	}
 	refreshList();
 	updateColumns();
 	
@@ -199,8 +190,6 @@ void LLPanelNearByMedia::draw()
 {
 	mItemCountText->setValue(llformat(getString("media_item_count_format").c_str(), mMediaList->getItemCount()));
 	
-//	refreshParcelMediaUI();
-//	refreshParcelAudioUI();
 	refreshList();
 	
 	F32 alpha = mHoverTimer.getStarted() 
@@ -221,11 +210,11 @@ bool LLPanelNearByMedia::getParcelAudioAutoStart()
 	return mParcelAudioAutoStart;
 }
 
-void LLPanelNearByMedia::addMediaItem(const LLUUID &id)
+LLScrollListItem* LLPanelNearByMedia::addListItem(const LLUUID &id)
 {
-	if (NULL == mMediaList) return;
+	if (NULL == mMediaList) return NULL;
 	
-	// Just set up the columns -- the values will be filled in by updateMediaItem().
+	// Just set up the columns -- the values will be filled in by updateListItem().
 	
 	LLSD row;
 	row["id"] = id;
@@ -255,22 +244,98 @@ void LLPanelNearByMedia::addMediaItem(const LLUUID &id)
 	}
 	
 	LLScrollListItem* new_item = mMediaList->addElement(row);
-	LLScrollListCheck* scroll_list_check = dynamic_cast<LLScrollListCheck*>(new_item->getColumn(CHECKBOX_COLUMN));
-	if (scroll_list_check)
+	if (NULL != new_item)
 	{
-		LLCheckBoxCtrl *check = scroll_list_check->getCheckBox();
-		check->setCommitCallback(boost::bind(&LLPanelNearByMedia::onCheckItem, this, _1, id));
-	}
+		LLScrollListCheck* scroll_list_check = dynamic_cast<LLScrollListCheck*>(new_item->getColumn(CHECKBOX_COLUMN));
+		if (scroll_list_check)
+		{
+			LLCheckBoxCtrl *check = scroll_list_check->getCheckBox();
+			check->setCommitCallback(boost::bind(&LLPanelNearByMedia::onCheckItem, this, _1, id));
+		}
+	}	
+	return new_item;
 }
 
-void LLPanelNearByMedia::updateMediaItem(LLScrollListItem* item, LLViewerMediaImpl* impl)
+void LLPanelNearByMedia::updateListItem(LLScrollListItem* item, LLViewerMediaImpl* impl)
+{
+	std::string item_name;
+	std::string item_tooltip;		
+	std::string debug_str;
+	LLPanelNearByMedia::MediaClass media_class = MEDIA_CLASS_ALL;
+	
+	getNameAndUrlHelper(impl, item_name, item_tooltip, mEmptyNameString);
+	// Focused
+	if (impl->hasFocus())
+	{
+		media_class = MEDIA_CLASS_FOCUSED;
+	}
+	// Is attached to another avatar?
+	else if (impl->isAttachedToAnotherAvatar())
+	{
+		media_class = MEDIA_CLASS_ON_OTHERS;
+	}
+	// Outside agent parcel
+	else if (!impl->isInAgentParcel())
+	{
+		media_class = MEDIA_CLASS_OUTSIDE_PARCEL;
+	}
+	else {
+		// inside parcel
+		media_class = MEDIA_CLASS_WITHIN_PARCEL;
+	}
+	
+	if(mDebugInfoVisible)
+	{
+		debug_str += llformat("%g/", (float)impl->getInterest());
+		
+		// proximity distance is actually distance squared -- display it as straight distance.
+		debug_str += llformat("%g/", fsqrtf(impl->getProximityDistance()));
+		
+		//			s += llformat("%g/", (float)impl->getCPUUsage());
+		//			s += llformat("%g/", (float)impl->getApproximateTextureInterest());
+		debug_str += llformat("%g/", (float)(NULL == impl->getSomeObject()) ? 0.0 : impl->getSomeObject()->getPixelArea());
+		
+		debug_str += LLPluginClassMedia::priorityToString(impl->getPriority());
+		
+		if(impl->hasMedia())
+		{
+			debug_str += '@';
+		}
+		else if(impl->isPlayable())
+		{
+			debug_str += '+';
+		}
+		else if(impl->isForcedUnloaded())
+		{
+			debug_str += '!';
+		}
+	}
+	
+	updateListItem(item,
+				   item_name,
+				   item_tooltip,
+				   impl->getProximity(),
+				   impl->isMediaDisabled(),
+				   impl->hasMedia(),
+				   impl->isMediaTimeBased() &&	impl->isMediaPlaying(),
+				   media_class,
+				   debug_str);
+}
+
+void LLPanelNearByMedia::updateListItem(LLScrollListItem* item,
+										  const std::string &item_name,
+										  const std::string &item_tooltip,
+										  S32 proximity,
+										  bool is_disabled,
+										  bool has_media,
+										  bool is_time_based_and_playing,
+										  LLPanelNearByMedia::MediaClass media_class,
+										  const std::string &debug_str)
 {
 	LLScrollListCell* cell = item->getColumn(PROXIMITY_COLUMN);
 	if(cell)
 	{
 		// since we are forced to sort by text, encode sort order as string
-		// proximity of -1 means "closest"
-		S32 proximity = impl->isParcelMedia() ? -1 : impl->getProximity();
 		std::string proximity_string = STRINGIZE(proximity);
 		std::string old_proximity_string = cell->getValue().asString();
 		if(proximity_string != old_proximity_string)
@@ -283,86 +348,83 @@ void LLPanelNearByMedia::updateMediaItem(LLScrollListItem* item, LLViewerMediaIm
 	cell = item->getColumn(CHECKBOX_COLUMN);
 	if(cell)
 	{
-		cell->setValue(!impl->isMediaDisabled());
+		cell->setValue(!is_disabled);
 	}
 	
 	cell = item->getColumn(VISIBILITY_COLUMN);
 	if(cell)
 	{
 		S32 old_visibility = cell->getValue();
-		S32 new_visibility = (impl->hasMedia()) ? 1 : ((impl->isMediaDisabled()) ? 0 : -1);
+		// *HACK ALERT: force ordering of Media before Audio before the rest of the list
+		S32 new_visibility = 
+			item->getUUID() == PARCEL_MEDIA_LIST_ITEM_UUID ? 3
+			: item->getUUID() == PARCEL_AUDIO_LIST_ITEM_UUID ? 2
+			: (has_media) ? 1 
+			: ((is_disabled) ? 0
+			: -1);
 		cell->setValue(STRINGIZE(new_visibility));
 		if (new_visibility != old_visibility)
 		{			
 			mMediaList->setNeedsSort(true);
 		}
 	}
-		
-	S32 media_class = -1;
+	
 	cell = item->getColumn(NAME_COLUMN);
 	if(cell)
 	{
-		std::string name;
-		std::string url;
+		std::string name = item_name;
 		std::string old_name = cell->getValue().asString();
-		
-		getNameAndUrlHelper(impl, name, url, mEmptyNameString);
-		
-		if (impl->isParcelMedia())
+		if (has_media) 
 		{
-			cell->setToolTip(name + " : " + url);
-			name = mDefaultParcelMediaName;
-		}
-		else {
-		cell->setToolTip(url);
+			name += " " + mPlayingString;
 		}
-		if (impl->hasMedia()) name += " " + mPlayingString;
 		if (name != old_name)
 		{
 			cell->setValue(name);
 		}
+		cell->setToolTip(item_tooltip);
 		
 		// *TODO: Make these font styles/colors configurable via XUI
-		LLColor4 cell_color = LLColor4::white;
 		U8 font_style = LLFontGL::NORMAL;
+		LLColor4 cell_color = LLColor4::white;
 		
-		// Focused
-		if (impl->hasFocus())
-		{
-			if (mDebugInfoVisible) cell_color = LLColor4::yellow;
-			media_class = MEDIA_CLASS_FOCUSED;
-		}
-		// Is attached to another avatar?
-		else if (impl->isAttachedToAnotherAvatar())
-		{
-			if (mDebugInfoVisible) cell_color = LLColor4::red;
-			media_class = MEDIA_CLASS_ON_OTHERS;
-		}
-		// Outside agent parcel
-		else if (!impl->isInAgentParcel())
+		// Only colorize by class in debug
+		if (mDebugInfoVisible)
 		{
-			if (mDebugInfoVisible) cell_color = LLColor4::orange;
-			media_class = MEDIA_CLASS_OUTSIDE_PARCEL;
-		}
-		else {
-			// inside parcel
-			media_class = MEDIA_CLASS_WITHIN_PARCEL;
+			switch (media_class) {
+				case MEDIA_CLASS_FOCUSED:
+					cell_color = LLColor4::yellow;
+					break;
+				case MEDIA_CLASS_ON_OTHERS:
+					cell_color = LLColor4::red;
+					break;
+				case MEDIA_CLASS_OUTSIDE_PARCEL:
+					cell_color = LLColor4::orange;
+					break;
+				case MEDIA_CLASS_WITHIN_PARCEL:
+				default:
+					break;
+			}
 		}
-		if (impl->isMediaDisabled())
+		if (is_disabled)
 		{
-			//font_style |= LLFontGL::ITALIC;
-			//cell_color = LLColor4::black;
-			// Dim it if it is disabled
-			cell_color.setAlpha(0.25);
+			if (mDebugInfoVisible)
+			{
+				font_style |= LLFontGL::ITALIC;
+				cell_color = LLColor4::black;
+			}
+			else {
+				// Dim it if it is disabled
+				cell_color.setAlpha(0.25);
+			}
 		}
 		// Dim it if it isn't "showing"
-		else if (!impl->hasMedia())
+		else if (!has_media)
 		{
 			cell_color.setAlpha(0.25);
 		}
 		// Bold it if it is time-based media and it is playing
-		else if (impl->isMediaTimeBased() &&
-				 impl->isMediaPlaying())
+		else if (is_time_based_and_playing)
 		{
 			if (mDebugInfoVisible) font_style |= LLFontGL::BOLD;
 		}
@@ -386,125 +448,101 @@ void LLPanelNearByMedia::updateMediaItem(LLScrollListItem* item, LLViewerMediaIm
 		cell = item->getColumn(DEBUG_COLUMN);
 		if(cell)
 		{
-			std::string s;
-			
-			s += llformat("%g/", (float)impl->getInterest());
-
-			// proximity distance is actually distance squared -- display it as straight distance.
-			s += llformat("%g/", fsqrtf(impl->getProximityDistance()));
-
-//			s += llformat("%g/", (float)impl->getCPUUsage());
-//			s += llformat("%g/", (float)impl->getApproximateTextureInterest());
-			s += llformat("%g/", (float)(NULL == impl->getSomeObject()) ? 0.0 : impl->getSomeObject()->getPixelArea());
-			
-			s += LLPluginClassMedia::priorityToString(impl->getPriority());
-			
-			if(impl->hasMedia())
-			{
-				s += '@';
-			}
-			else if(impl->isPlayable())
-			{
-				s += '+';
-			}
-			else if(impl->isForcedUnloaded())
-			{
-				s += '!';
-			}
-				
-			cell->setValue(s);
+			cell->setValue(debug_str);
 		}
 	}
 }
-
-void LLPanelNearByMedia::removeMediaItem(const LLUUID &id)
+						 
+void LLPanelNearByMedia::removeListItem(const LLUUID &id)
 {
 	if (NULL == mMediaList) return;
 	
 	mMediaList->deleteSingleItem(mMediaList->getItemIndex(id));
 }
 
-void LLPanelNearByMedia::refreshParcelMediaUI()
-{	
-	std::string url = LLViewerParcelMedia::getURL();
-	LLStyle::Params style_params;
-	if (url.empty())
-	{	
-		style_params.font.style = "ITALIC";
-		mParcelMediaText->setText(mDefaultParcelMediaName, style_params);
-		mEnableParcelMediaCtrl->setEnabled(false);
-		mDisableParcelMediaCtrl->setEnabled(false);
-	}
-	else {
-		std::string name = LLViewerParcelMedia::getName();
-		if (name.empty()) name = url;
-		mParcelMediaText->setText(name, style_params);
-		mParcelMediaText->setToolTip(url);
-		mEnableParcelMediaCtrl->setEnabled(true);
-		mDisableParcelMediaCtrl->setEnabled(true);
-	}
-	
-	// Set up the default play controls state
-	mParcelMediaPauseCtrl->setEnabled(false);
-	mParcelMediaPauseCtrl->setVisible(false);
-	mParcelMediaPlayCtrl->setEnabled(true);
-	mParcelMediaPlayCtrl->setVisible(true);
-	mParcelMediaCtrl->setEnabled(false);
+void LLPanelNearByMedia::refreshParcelItems()
+{
+	//
+	// First add/remove the "fake" items Parcel Media and Parcel Audio.
+	// These items will have special UUIDs 
+	//    PARCEL_MEDIA_LIST_ITEM_UUID
+	//    PARCEL_AUDIO_LIST_ITEM_UUID
+	//
+	// Get the filter choice.
+	const LLSD &choice_llsd = mShowCtrl->getSelectedValue();
+	MediaClass choice = (MediaClass)choice_llsd.asInteger();
+	// Only show "special parcel items" if "All" or "Within" filter
+	bool should_include = choice == MEDIA_CLASS_ALL || choice == MEDIA_CLASS_WITHIN_PARCEL;
 	
-	if (LLViewerParcelMedia::getParcelMedia())
+	// First Parcel Media: add or remove it as necessary
+	if (should_include && LLViewerMedia::hasParcelMedia())
 	{
-		if (LLViewerParcelMedia::getParcelMedia()->getMediaPlugin() &&
-			LLViewerParcelMedia::getParcelMedia()->getMediaPlugin()->pluginSupportsMediaTime())
+		// Yes, there is parcel media.
+		if (NULL == mParcelMediaItem)
 		{
-			mParcelMediaCtrl->setEnabled(true);
-			
-			switch(LLViewerParcelMedia::getParcelMedia()->getMediaPlugin()->getStatus())
-			{
-				case LLPluginClassMediaOwner::MEDIA_PLAYING:
-					mParcelMediaPlayCtrl->setEnabled(false);
-					mParcelMediaPlayCtrl->setVisible(false);
-					mParcelMediaPauseCtrl->setEnabled(true);
-					mParcelMediaPauseCtrl->setVisible(true);
-					break;
-				case LLPluginClassMediaOwner::MEDIA_PAUSED:
-				default:
-					// default play status is kosher
-					break;
-			}
+			mParcelMediaItem = addListItem(PARCEL_MEDIA_LIST_ITEM_UUID);
+			mMediaList->setNeedsSort(true);
 		}
 	}
-}
-
-void LLPanelNearByMedia::refreshParcelAudioUI()
-{	
-	bool parcel_audio_enabled = !getParcelAudioURL().empty();
-
-	mParcelAudioCtrl->setToolTip(getParcelAudioURL());
+	else if (NULL != mParcelMediaItem) {
+		removeListItem(PARCEL_MEDIA_LIST_ITEM_UUID);
+		mParcelMediaItem = NULL;
+		mMediaList->setNeedsSort(true);	
+	}
 	
-	if (gAudiop && parcel_audio_enabled)
+	// ... then update it
+	if (NULL != mParcelMediaItem)
 	{
-		mParcelAudioCtrl->setEnabled(true);
-
-		if (PARCEL_AUDIO_PLAYING == gAudiop->isInternetStreamPlaying())
+		std::string name, url, tooltip;
+		getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
+		if (name.empty())
 		{
-			mParcelAudioPlayCtrl->setEnabled(false);
-			mParcelAudioPlayCtrl->setVisible(false);
-			mParcelAudioPauseCtrl->setEnabled(true);
-			mParcelAudioPauseCtrl->setVisible(true);
+			tooltip = url;
 		}
 		else {
-			mParcelAudioPlayCtrl->setEnabled(true);
-			mParcelAudioPlayCtrl->setVisible(true);
-			mParcelAudioPauseCtrl->setEnabled(false);
-			mParcelAudioPauseCtrl->setVisible(false);
+			tooltip = name + " : " + url;
 		}
+		LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia();
+		updateListItem(mParcelMediaItem,
+					   mParcelMediaName,
+					   tooltip,
+					   -2, // Proximity closer than anything else, before Parcel Audio
+					   impl == NULL || impl->isMediaDisabled(),
+					   impl != NULL && !LLViewerParcelMedia::getURL().empty(),
+					   impl != NULL && impl->isMediaTimeBased() &&	impl->isMediaPlaying(),
+					   MEDIA_CLASS_ALL,
+					   "parcel media");
 	}
-	else {
-		mParcelAudioCtrl->setEnabled(false);
-		mParcelAudioPlayCtrl->setEnabled(true);
-		mParcelAudioPlayCtrl->setVisible(true);
-		mParcelAudioPauseCtrl->setEnabled(false);
-		mParcelAudioPauseCtrl->setVisible(false);
+	
+	// Next Parcel Audio: add or remove it as necessary
+	if (should_include && LLViewerMedia::hasParcelAudio())
+	{
+		// Yes, there is parcel audio.
+		if (NULL == mParcelAudioItem)
+		{
+			mParcelAudioItem = addListItem(PARCEL_AUDIO_LIST_ITEM_UUID);
+			mMediaList->setNeedsSort(true);
+		}
+	}
+	else if (NULL != mParcelAudioItem) {
+		removeListItem(PARCEL_AUDIO_LIST_ITEM_UUID);
+		mParcelAudioItem = NULL;
+		mMediaList->setNeedsSort(true);
+	}
+	
+	// ... then update it
+	if (NULL != mParcelAudioItem)
+	{
+		bool is_playing = LLViewerMedia::isParcelAudioPlaying();
+		updateListItem(mParcelAudioItem,
+					   mParcelAudioName,
+					   LLViewerMedia::getParcelAudioURL(),
+					   -1, // Proximity after Parcel Media, but closer than anything else
+					   !is_playing,
+					   is_playing,
+					   is_playing,
+					   MEDIA_CLASS_ALL,
+					   "parcel audio");
 	}
 }
 
@@ -531,6 +569,8 @@ void LLPanelNearByMedia::refreshList()
 		updateColumns();
 	}
 	
+	refreshParcelItems();
+	
 	// Get the canonical list from LLViewerMedia
 	LLViewerMedia::impl_list impls = LLViewerMedia::getPriorityList();
 	LLViewerMedia::impl_list::iterator priority_iter;
@@ -548,27 +588,19 @@ void LLPanelNearByMedia::refreshList()
 		{
 			impl->setInNearbyMediaList(false);
 		}
-		
+
+		if (!impl->isParcelMedia())
 		{
-			bool remove_item = false;
 			LLUUID media_id = impl->getMediaTextureID();
-			if (impl->isParcelMedia())
-			{
-				remove_item = LLViewerParcelMedia::getURL().empty();
-			}
-			else {
-				S32 proximity = impl->getProximity();
+			S32 proximity = impl->getProximity();
 			// This is expensive (i.e. a linear search) -- don't use it here.  We now use mInNearbyMediaList instead.
-//			S32 index = mMediaList->getItemIndex(media_id);
-				remove_item = (proximity < 0 || !shouldShow(impl));
-			}
-			if (remove_item)
+			//S32 index = mMediaList->getItemIndex(media_id);
+			if (proximity < 0 || !shouldShow(impl))
 			{
-				// This isn't inworld media -- don't show it in the list.
 				if (impl->getInNearbyMediaList())
 				{
 					// There's a row for this impl -- remove it.
-					removeMediaItem(media_id);
+					removeListItem(media_id);
 					impl->setInNearbyMediaList(false);
 				}
 			}
@@ -577,7 +609,7 @@ void LLPanelNearByMedia::refreshList()
 				if (!impl->getInNearbyMediaList())
 				{
 					// We don't have a row for this impl -- add one.
-					addMediaItem(media_id);
+					addListItem(media_id);
 					impl->setInNearbyMediaList(true);
 				}
 			}
@@ -590,9 +622,15 @@ void LLPanelNearByMedia::refreshList()
 				enabled_count++;
 		}
 	}
-	}
-	mDisableAllCtrl->setEnabled(LLViewerMedia::isAnyMediaShowing());
-	mEnableAllCtrl->setEnabled(disabled_count > 0);
+	}	
+	mDisableAllCtrl->setEnabled(LLViewerMedia::isAnyMediaShowing() || 
+								LLViewerMedia::isParcelMediaPlaying() ||
+								LLViewerMedia::isParcelAudioPlaying());
+	mEnableAllCtrl->setEnabled(disabled_count > 0 ||
+							   // parcel media (if we have it, and it isn't playing, enable "start")
+							   (LLViewerMedia::hasParcelMedia() && ! LLViewerMedia::isParcelMediaPlaying()) ||
+							   // parcel audio (if we have it, and it isn't playing, enable "start")
+							   (LLViewerMedia::hasParcelAudio() && ! LLViewerMedia::isParcelAudioPlaying()));
 
 	// Iterate over the rows in the control, updating ones whose impl exists, and deleting ones whose impl has gone away.
 	std::vector<LLScrollListItem*> items = mMediaList->getAllData();
@@ -604,17 +642,21 @@ void LLPanelNearByMedia::refreshList()
 		LLScrollListItem* item = (*item_it);
 		LLUUID row_id = item->getUUID();
 		
-		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
-		if(impl)
-		{
-			updateMediaItem(item, impl);
-		}
-		else
+		if (row_id != PARCEL_MEDIA_LIST_ITEM_UUID &&
+			row_id != PARCEL_AUDIO_LIST_ITEM_UUID)
 		{
-			// This item's impl has been deleted -- remove the row.
-			// Removing the row won't throw off our iteration, since we have a local copy of the array.
-			// We just need to make sure we don't access this item after the delete.
-			removeMediaItem(row_id);
+			LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
+			if(impl)
+			{
+				updateListItem(item, impl);
+			}
+			else
+			{
+				// This item's impl has been deleted -- remove the row.
+				// Removing the row won't throw off our iteration, since we have a local copy of the array.
+				// We just need to make sure we don't access this item after the delete.
+				removeListItem(row_id);
+			}
 		}
 	}
 	
@@ -645,29 +687,28 @@ void LLPanelNearByMedia::updateColumns()
 }
 
 void LLPanelNearByMedia::onClickEnableAll()
-	{
+{
 	LLViewerMedia::setAllMediaEnabled(true);
-	// Parcel Audio, too
-	onClickParcelAudioPlay();
-	}
+}
 
 void LLPanelNearByMedia::onClickDisableAll()
-	{
+{
 	LLViewerMedia::setAllMediaEnabled(false);
-	// Parcel Audio, too
-		onClickParcelAudioStop();
-	}
+}
 
 void LLPanelNearByMedia::onClickEnableParcelMedia()
 {	
+	if ( ! LLViewerMedia::isParcelMediaPlaying() )
+	{
 		LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
 	}
+}
 
 void LLPanelNearByMedia::onClickDisableParcelMedia()
 {	
-		// This actually unloads the impl, as opposed to "stop"ping the media
-		LLViewerParcelMedia::stop();
-	}
+	// This actually unloads the impl, as opposed to "stop"ping the media
+	LLViewerParcelMedia::stop();
+}
 
 void LLPanelNearByMedia::onCheckItem(LLUICtrl* ctrl, const LLUUID &row_id)
 {	
@@ -678,12 +719,26 @@ void LLPanelNearByMedia::onCheckItem(LLUICtrl* ctrl, const LLUUID &row_id)
 
 bool LLPanelNearByMedia::setDisabled(const LLUUID &row_id, bool disabled)
 {
-	LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
-	if(impl)
+	if (row_id == PARCEL_AUDIO_LIST_ITEM_UUID)
 	{
-		impl->setDisabled(disabled);
+		if (disabled) onClickParcelAudioStop();
+		else onClickParcelAudioStart();
 		return true;
 	}
+	else if (row_id == PARCEL_MEDIA_LIST_ITEM_UUID)
+	{
+		if (disabled) onClickDisableParcelMedia();
+		else onClickEnableParcelMedia();
+		return true;
+	}
+	else {
+		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
+		if(impl)
+		{
+			impl->setDisabled(disabled);
+			return true;
+		}
+	}
 	return false;
 }
 								
@@ -733,6 +788,18 @@ void LLPanelNearByMedia::onClickParcelMediaPause()
 	LLViewerParcelMedia::pause();
 }
 
+void LLPanelNearByMedia::onClickParcelAudioStart()
+{
+	// User *explicitly* started the internet stream, so keep the stream
+	// playing and updated as they cross to other parcels etc.
+	mParcelAudioAutoStart = true;
+	
+	if (!gAudiop)
+		return;
+	
+	gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
+}
+
 void LLPanelNearByMedia::onClickParcelAudioPlay()
 {
 	// User *explicitly* started the internet stream, so keep the stream
@@ -742,13 +809,13 @@ void LLPanelNearByMedia::onClickParcelAudioPlay()
 	if (!gAudiop)
 		return;
 
-	if (PARCEL_AUDIO_PAUSED == gAudiop->isInternetStreamPlaying())
+	if (LLAudioEngine::AUDIO_PAUSED == gAudiop->isInternetStreamPlaying())
 	{
 		// 'false' means unpause
 		gAudiop->pauseInternetStream(false);
 	}
 	else {
-		gAudiop->startInternetStream(getParcelAudioURL());
+		gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
 	}
 }
 
@@ -829,7 +896,7 @@ void LLPanelNearByMedia::onMoreLess()
 
 	setShape(new_rect);
 }
-
+		
 // static
 void LLPanelNearByMedia::getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName)
 {
@@ -855,10 +922,3 @@ void LLPanelNearByMedia::getNameAndUrlHelper(LLViewerMediaImpl* impl, std::strin
 	}
 }
 
-// static
-std::string LLPanelNearByMedia::getParcelAudioURL()
-{
-	return LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL();
-}
-
-
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
index 8b30f3c0e0..d10c6a9e13 100644
--- a/indra/newview/llpanelnearbymedia.h
+++ b/indra/newview/llpanelnearbymedia.h
@@ -84,15 +84,23 @@ private:
 	};
 		
 	// Add/remove an LLViewerMediaImpl to/from the list
-	void addMediaItem(const LLUUID &id);
-	void updateMediaItem(LLScrollListItem* item, LLViewerMediaImpl* impl);
-	void removeMediaItem(const LLUUID &id);
+	LLScrollListItem* addListItem(const LLUUID &id);
+	void updateListItem(LLScrollListItem* item, LLViewerMediaImpl* impl);
+	void updateListItem(LLScrollListItem* item,
+						const std::string &item_name,
+						const std::string &item_tooltip,
+						S32 proximity,
+						bool is_disabled,
+						bool has_media,
+						bool is_time_based_and_playing,
+						MediaClass media_class,
+						const std::string &debug_str);
+	void removeListItem(const LLUUID &id);
 	
 	// Refresh the list in the UI
 	void refreshList();
 	
-	void refreshParcelMediaUI();
-	void refreshParcelAudioUI();
+	void refreshParcelItems();
 
 	// UI Callbacks 
 	void onClickEnableAll();
@@ -106,6 +114,7 @@ private:
 	void onClickParcelMediaPause();
 	void onClickParcelAudioPlay();
 	void onClickParcelAudioStop();
+	void onClickParcelAudioStart();
 	void onClickParcelAudioPause();
 	void onCheckAutoPlay();
 	void onAdvancedButtonClick();	
@@ -117,10 +126,8 @@ private:
 	
 private:
 	bool setDisabled(const LLUUID &id, bool disabled);
-	
-	static void getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName);
 
-	static std::string getParcelAudioURL();
+	static void getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName);
 	
 	void updateColumns();
 	
@@ -134,7 +141,6 @@ private:
 	LLButton*			mParcelMediaMuteCtrl;
 	LLUICtrl*			mEnableParcelMediaCtrl;
 	LLUICtrl*			mDisableParcelMediaCtrl;
-	LLTextBox*			mParcelMediaText;
 	LLTextBox*			mItemCountText;
 	LLUICtrl*			mParcelMediaCtrl;
 	LLUICtrl*			mParcelMediaPlayCtrl;
@@ -148,12 +154,15 @@ private:
 	bool				mDebugInfoVisible;
 	bool				mParcelAudioAutoStart;
 	std::string			mEmptyNameString;
-	std::string			mDefaultParcelMediaName;
 	std::string			mPlayingString;
+	std::string			mParcelMediaName;
+	std::string			mParcelAudioName;
 	
 	S32					mOriginalHeight;
 	S32					mNearbyMediaPanelHeight;
 	LLFrameTimer		mHoverTimer;
+	LLScrollListItem*	mParcelMediaItem;
+	LLScrollListItem*	mParcelAudioItem;
 };
 
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 025f03dc5a..235de89f47 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -376,7 +376,12 @@ void LLStatusBar::refresh()
 	bool mute_audio = LLAppViewer::instance()->getMasterSystemAudioMute();
 	mBtnVolume->setToggleState(mute_audio);
 	
-	mMediaToggle->setValue(!LLViewerMedia::isAnyMediaShowing());
+	// Don't show media toggle if there's no media, parcel media, and no parcel audio
+	mMediaToggle->setVisible(LLViewerMedia::hasInWorldMedia() || LLViewerMedia::hasParcelMedia() || LLViewerMedia::hasParcelAudio());
+	// Note the "sense" of the toggle is opposite whether media is playing or not
+	mMediaToggle->setValue(! (LLViewerMedia::isAnyMediaShowing() || 
+							  LLViewerMedia::isParcelMediaPlaying() ||
+							  LLViewerMedia::isParcelAudioPlaying()));
 }
 
 void LLStatusBar::setVisibleForMouselook(bool visible)
@@ -406,8 +411,8 @@ void LLStatusBar::setBalance(S32 balance)
 	LLButton* btn_buy_currency = getChild<LLButton>("buycurrency");
 	LLStringUtil::format_map_t string_args;
 	string_args["[AMT]"] = llformat("%s", money_str.c_str());
-	std::string labe_str = getString("buycurrencylabel", string_args);
-	btn_buy_currency->setLabel(labe_str);
+	std::string label_str = getString("buycurrencylabel", string_args);
+	btn_buy_currency->setLabel(label_str);
 
 	// Resize the balance button so that the label fits it, and the button expands to the left.
 	// *TODO: LLButton should have an option where to expand.
@@ -559,7 +564,8 @@ void LLStatusBar::onClickMediaToggle(void* data)
 {
 	LLStatusBar *status_bar = (LLStatusBar*)data;
 	// "Selected" means it was showing the "play" icon (so media was playing), and now it shows "pause", so turn off media
-	LLViewerMedia::setAllMediaEnabled(! status_bar->mMediaToggle->getValue());
+	bool enable = ! status_bar->mMediaToggle->getValue();
+	LLViewerMedia::setAllMediaEnabled(enable);
 }
 
 // sets the static variables necessary for the date
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 1b6236ce4a..7b5d1d9814 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -864,26 +864,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 
 		total_cpu += pimpl->getCPUUsage();
 		
-		// Only set sAnyMedia​Showing if it isn't used in the UI. If it isn't 
-		// parcel media, do the normal "hasMedia()" check. If it is parcel media, 
-		// hasMedia() seems to always be true, so we do some other checks to see 
-		// if there actually is parcel media  showing
-		if (!pimpl->getUsedInUI())
+		if (!pimpl->getUsedInUI() && pimpl->hasMedia())
 		{
-			if (! pimpl->isParcelMedia())
-			{
-				if (pimpl->hasMedia())
-				{
-					sAnyMediaShowing = true;
-				}
-			}
-			else {
-				// Parcel media showing?
-				if (!LLViewerParcelMedia::getURL().empty() && LLViewerParcelMedia::getParcelMedia().notNull())
-				{
-					sAnyMediaShowing = true;
-				}
-			}
+			sAnyMediaShowing = true;
 		}
 
 	}
@@ -947,9 +930,84 @@ void LLViewerMedia::setAllMediaEnabled(bool val)
 	for(; iter != end; iter++)
 	{
 		LLViewerMediaImpl* pimpl = *iter;
-		if (!pimpl->getUsedInUI()) 
+		if (!pimpl->getUsedInUI())
+		{
 			pimpl->setDisabled(!val);
+		}
+	}
+	
+	// Also do Parcel Media and Parcel Audio
+	if (val)
+	{
+		if (!LLViewerMedia::isParcelMediaPlaying())
+		{	
+			LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
+		}
+		
+		if (!LLViewerMedia::isParcelAudioPlaying() && gAudiop)
+		{
+			gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
+		}
 	}
+	else {
+		// This actually unloads the impl, as opposed to "stop"ping the media
+		LLViewerParcelMedia::stop();
+		if (gAudiop) gAudiop->stopInternetStream();
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::isParcelMediaPlaying()
+{
+	return (LLViewerMedia::hasParcelMedia() && LLViewerParcelMedia::getParcelMedia() && LLViewerParcelMedia::getParcelMedia()->hasMedia());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::isParcelAudioPlaying()
+{
+	return (LLViewerMedia::hasParcelAudio() && gAudiop && LLAudioEngine::AUDIO_PLAYING == gAudiop->isInternetStreamPlaying());
+}
+
+bool LLViewerMedia::hasInWorldMedia()
+{
+	if (! gSavedSettings.getBOOL("AudioStreamingMedia")) return false;
+	if (sInWorldMediaDisabled) return false;
+	impl_list::iterator iter = sViewerMediaImplList.begin();
+	impl_list::iterator end = sViewerMediaImplList.end();
+	// This should be quick, because there should be very few non-in-world-media impls
+	for (; iter != end; iter++)
+	{
+		LLViewerMediaImpl* pimpl = *iter;
+		if (!pimpl->getUsedInUI() && !pimpl->isParcelMedia())
+		{
+			// Found an in-world media impl
+			return true;
+		}
+	}
+	return false;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::hasParcelMedia()
+{
+	return !LLViewerParcelMedia::getURL().empty();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::hasParcelAudio()
+{
+	return !LLViewerMedia::getParcelAudioURL().empty();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+std::string LLViewerMedia::getParcelAudioURL()
+{
+	return LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 9d21b4e9fe..ec25744fa2 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -73,60 +73,68 @@ class LLViewerMediaImpl;
 class LLViewerMedia
 {
 	LOG_CLASS(LLViewerMedia);
-	public:
-
-		// String to get/set media autoplay in gSavedSettings
-		static const char* AUTO_PLAY_MEDIA_SETTING;
-		static const char* SHOW_MEDIA_ON_OTHERS_SETTING;
-		static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING;
-		static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING;
-	
-		typedef std::vector<LLViewerMediaImpl*> impl_list;
-
-		typedef std::map<LLUUID, LLViewerMediaImpl*> impl_id_map;
-
-		// Special case early init for just web browser component
-		// so we can show login screen.  See .cpp file for details. JC
-
-		static viewer_media_t newMediaImpl(const LLUUID& texture_id,
-												S32 media_width = 0, 
-												S32 media_height = 0, 
-												U8 media_auto_scale = false,
-												U8 media_loop = false);
-
-		static viewer_media_t updateMediaImpl(LLMediaEntry* media_entry, const std::string& previous_url, bool update_from_self);
-		static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id);
-		static std::string getCurrentUserAgent();
-		static void updateBrowserUserAgent();
-		static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/);
-		static bool textureHasMedia(const LLUUID& texture_id);
-		static void setVolume(F32 volume);
-
-		// Is any media currently "showing"?  Includes Parcel Media.  Does not include media in the UI.
-		static bool isAnyMediaShowing();
-		// Set all media enabled or disabled, depending on val.   Does not include media in the UI.
-		static void setAllMediaEnabled(bool val);
-	
-		static void updateMedia(void* dummy_arg = NULL);
-
-		static void initClass();
-		static void cleanupClass();
-
-		static F32 getVolume();	
-		static void muteListChanged();
-		static void setInWorldMediaDisabled(bool disabled);
-		static bool getInWorldMediaDisabled();
-				
-		static bool isInterestingEnough(const LLVOVolume* object, const F64 &object_interest);
-	
-		// Returns the priority-sorted list of all media impls.
-		static impl_list &getPriorityList();
-		
-		// This is the comparitor used to sort the list.
-		static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2);
+public:
+	
+	// String to get/set media autoplay in gSavedSettings
+	static const char* AUTO_PLAY_MEDIA_SETTING;
+	static const char* SHOW_MEDIA_ON_OTHERS_SETTING;
+	static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING;
+	static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING;
+	
+	typedef std::vector<LLViewerMediaImpl*> impl_list;
+	
+	typedef std::map<LLUUID, LLViewerMediaImpl*> impl_id_map;
+	
+	// Special case early init for just web browser component
+	// so we can show login screen.  See .cpp file for details. JC
+	
+	static viewer_media_t newMediaImpl(const LLUUID& texture_id,
+									   S32 media_width = 0, 
+									   S32 media_height = 0, 
+									   U8 media_auto_scale = false,
+									   U8 media_loop = false);
+	
+	static viewer_media_t updateMediaImpl(LLMediaEntry* media_entry, const std::string& previous_url, bool update_from_self);
+	static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id);
+	static std::string getCurrentUserAgent();
+	static void updateBrowserUserAgent();
+	static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/);
+	static bool textureHasMedia(const LLUUID& texture_id);
+	static void setVolume(F32 volume);
 	
-	private:
-		static void onTeleportFinished();
+	// Is any media currently "showing"?  Includes Parcel Media.  Does not include media in the UI.
+	static bool isAnyMediaShowing();
+	// Set all media enabled or disabled, depending on val.   Does not include media in the UI.
+	static void setAllMediaEnabled(bool val);
+	
+	static void updateMedia(void* dummy_arg = NULL);
+	
+	static void initClass();
+	static void cleanupClass();
+	
+	static F32 getVolume();	
+	static void muteListChanged();
+	static void setInWorldMediaDisabled(bool disabled);
+	static bool getInWorldMediaDisabled();
+	
+	static bool isInterestingEnough(const LLVOVolume* object, const F64 &object_interest);
+	
+	// Returns the priority-sorted list of all media impls.
+	static impl_list &getPriorityList();
+	
+	// This is the comparitor used to sort the list.
+	static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2);
+	
+	// These are just helper functions for the convenience of others working with media
+	static bool hasInWorldMedia();
+	static std::string getParcelAudioURL();
+	static bool hasParcelMedia();
+	static bool hasParcelAudio();
+	static bool isParcelMediaPlaying();
+	static bool isParcelAudioPlaying();
+	
+private:
+	static void onTeleportFinished();
 };
 
 // Implementation functions not exported into header file
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 4fcdb30465..de372cb147 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -6,12 +6,13 @@
   	background_visible="true"
 	layout="topleft"
 	width="270"
-	height="310"
+	height="290"
 	name="nearby_media"
 	help_topic="nearby_media">
   <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">Parcel Media</string>
+  <string name="parcel_media_name">Parcel Streaming Media</string>
+  <string name="parcel_audio_name">Parcel Streaming Audio</string>
   <string name="playing_suffix">(playing)</string>
 	<panel
 		bevel_style="in"
@@ -63,7 +64,7 @@
 	  <button
 		name="more_less_btn"
 		follows="right"
-		tool_tip="Turn all nearby media on"
+		tool_tip="Advanced Controls"
 		top_delta="0"
 		right="-10"
 		width="60"
@@ -183,67 +184,69 @@
 			label="Debug"
 			name="media_debug" />
 	  </scroll_list>
-	<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="5"
-		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"/>
-	  <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"
+	  <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="5"
-		left="10"/>
-	  <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"/>
-	  <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"/>
-	  <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"/>
+		  height="90"
+		  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"/>
+		<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"/>
+<!--
+		<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"/>
+-->
+		<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"/>
+		<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"/>
+	  </panel>
 	</panel>
   </panel>
-</panel>
-- 
cgit v1.3


From a623f852cde86a290c8efda5c7b034f9b7bb75c2 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 16 Feb 2010 14:17:09 +0000
Subject: EXT-5394 [crashhunters] Crash in
 LLViewerMediaImpl::calculateInterest()

---
 indra/newview/llviewermedia.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 0e133f8729..25c843cf15 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2399,16 +2399,25 @@ void LLViewerMediaImpl::calculateInterest()
 		for(; iter != mObjectList.end() ; ++iter)
 		{
 			LLVOVolume *obj = *iter;
-			if(LLMuteList::getInstance()->isMuted(obj->getID()))
+			llassert(obj);
+			if (!obj) continue;
+			if(LLMuteList::getInstance() &&
+			   LLMuteList::getInstance()->isMuted(obj->getID()))
+			{
 				mIsMuted = true;
+			}
 			else
 			{
 				// We won't have full permissions data for all objects.  Attempt to mute objects when we can tell their owners are muted.
-				LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(obj);
-				if(obj_perm)
+				if (LLSelectMgr::getInstance())
 				{
-					if(LLMuteList::getInstance()->isMuted(obj_perm->getOwner()))
-						mIsMuted = true;
+					LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(obj);
+					if(obj_perm)
+					{
+						if(LLMuteList::getInstance() &&
+						   LLMuteList::getInstance()->isMuted(obj_perm->getOwner()))
+							mIsMuted = true;
+					}
 				}
 			}
 		}
-- 
cgit v1.3


From 0e234edcc67ecf534df15f088158ef236f6de102 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Tue, 16 Feb 2010 15:42:33 -0800
Subject: EXT-5270: Implement "dynamic" controls based on the selected item in
 Nearby Media Review #112 This change adds controls that change state based on
 the selection in the nearby media panel. There are basically 3 sets: -
 Time-based - Web-based ("Normal") - Disabled

Again, these change based on what you've got selected in the panel
---
 indra/newview/llpanelnearbymedia.cpp               | 309 +++++++++--
 indra/newview/llpanelnearbymedia.h                 |  49 +-
 indra/newview/llpanelprimmediacontrols.h           |  17 +-
 indra/newview/llviewermedia.cpp                    |   8 +-
 indra/newview/llviewermedia.h                      |   2 +-
 indra/newview/llviewermediafocus.cpp               |  13 +
 indra/newview/llviewermediafocus.h                 |   3 +
 indra/newview/llviewerparcelmgr.cpp                |   3 +-
 .../skins/default/xui/en/panel_nearby_media.xml    | 618 ++++++++++++++-------
 9 files changed, 745 insertions(+), 277 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 464ba97278..6a88c916d7 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -41,6 +41,7 @@
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
 #include "llscrolllistcell.h"
+#include "llslider.h"
 #include "llsliderctrl.h"
 #include "llagent.h"
 #include "llagentui.h"
@@ -75,28 +76,26 @@ static const LLUUID PARCEL_AUDIO_LIST_ITEM_UUID = LLUUID("DF4B020D-8A24-4B95-AB5
 LLPanelNearByMedia::LLPanelNearByMedia()
 :	mMediaList(NULL),
 	  mEnableAllCtrl(NULL),
-	  mEnableParcelMediaCtrl(NULL),	  
 	  mAllMediaDisabled(false),
 	  mDebugInfoVisible(false),
 	  mParcelMediaItem(NULL),
 	  mParcelAudioItem(NULL)
 {
-	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING);
+	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
+							gSavedSettings.getBOOL("MediaTentativeAutoPlay");
 
 	mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll",		boost::bind(&LLPanelNearByMedia::onClickEnableAll, this));
 	mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll",		boost::bind(&LLPanelNearByMedia::onClickDisableAll, this));
 	mCommitCallbackRegistrar.add("MediaListCtrl.GoMediaPrefs", boost::bind(&LLPanelNearByMedia::onAdvancedButtonClick, this));
 	mCommitCallbackRegistrar.add("MediaListCtrl.MoreLess", boost::bind(&LLPanelNearByMedia::onMoreLess, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.ParcelMediaVolume",		boost::bind(&LLPanelNearByMedia::onParcelMediaVolumeSlider, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.MuteParcelMedia",		boost::bind(&LLPanelNearByMedia::onClickMuteParcelMedia, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.EnableParcelMedia",		boost::bind(&LLPanelNearByMedia::onClickEnableParcelMedia, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.DisableParcelMedia",		boost::bind(&LLPanelNearByMedia::onClickDisableParcelMedia, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.Play",		boost::bind(&LLPanelNearByMedia::onClickParcelMediaPlay, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.Stop",		boost::bind(&LLPanelNearByMedia::onClickParcelMediaStop, this));
-	mCommitCallbackRegistrar.add("ParcelMediaCtrl.Pause",		boost::bind(&LLPanelNearByMedia::onClickParcelMediaPause, this));
-	mCommitCallbackRegistrar.add("ParcelAudioCtrl.Play",		boost::bind(&LLPanelNearByMedia::onClickParcelAudioPlay, this));
-	mCommitCallbackRegistrar.add("ParcelAudioCtrl.Stop",		boost::bind(&LLPanelNearByMedia::onClickParcelAudioStop, this));
-	mCommitCallbackRegistrar.add("ParcelAudioCtrl.Pause",		boost::bind(&LLPanelNearByMedia::onClickParcelAudioPause, this));
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Stop",		boost::bind(&LLPanelNearByMedia::onClickSelectedMediaStop, this));	
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Play",		boost::bind(&LLPanelNearByMedia::onClickSelectedMediaPlay, this));
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Pause",		boost::bind(&LLPanelNearByMedia::onClickSelectedMediaPause, this));
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Mute",		boost::bind(&LLPanelNearByMedia::onClickSelectedMediaMute, this));
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Volume",	boost::bind(&LLPanelNearByMedia::onCommitSelectedMediaVolume, this));
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Zoom",		boost::bind(&LLPanelNearByMedia::onClickSelectedMediaZoom, this));
+	mCommitCallbackRegistrar.add("SelectedMediaCtrl.Unzoom",	boost::bind(&LLPanelNearByMedia::onClickSelectedMediaUnzoom, this));
+	
 	LLUICtrlFactory::instance().buildPanel(this, "panel_nearby_media.xml");
 }
 
@@ -121,18 +120,19 @@ BOOL LLPanelNearByMedia::postBuild()
 	mMediaList = getChild<LLScrollListCtrl>("media_list");
 	mEnableAllCtrl = getChild<LLUICtrl>("all_nearby_media_enable_btn");
 	mDisableAllCtrl = getChild<LLUICtrl>("all_nearby_media_disable_btn");
-	mParcelMediaVolumeSlider = getChild<LLSliderCtrl>("parcel_media_volume");
-	mParcelMediaMuteCtrl = getChild<LLButton>("parcel_media_mute");
-	mEnableParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_enable_btn");
-	mDisableParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_disable_btn");
 	mItemCountText = getChild<LLTextBox>("media_item_count");
-	mParcelMediaPlayCtrl = getChild<LLButton>("parcel_media_play_btn");
-	mParcelMediaPauseCtrl = getChild<LLButton>("parcel_media_pause_btn");
-	mParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_ctrls");
-	mParcelAudioPlayCtrl = getChild<LLButton>("parcel_audio_play_btn");
-	mParcelAudioPauseCtrl = getChild<LLButton>("parcel_audio_pause_btn");
-	mParcelAudioCtrl = getChild<LLUICtrl>("parcel_audio_ctrls");
 	mShowCtrl = getChild<LLComboBox>("show_combo");
+
+	// Dynamic (selection-dependent) controls
+	mStopCtrl = getChild<LLUICtrl>("stop");
+	mPlayCtrl = getChild<LLUICtrl>("play");
+	mPauseCtrl = getChild<LLUICtrl>("pause");
+	mMuteCtrl = getChild<LLUICtrl>("mute");
+	mVolumeSliderCtrl = getChild<LLUICtrl>("volume_slider_ctrl");
+	mZoomCtrl = getChild<LLUICtrl>("zoom");
+	mUnzoomCtrl = getChild<LLUICtrl>("unzoom");
+	mVolumeSlider = getChild<LLSlider>("volume_slider");
+	mMuteBtn = getChild<LLButton>("mute_btn");
 	
 	mEmptyNameString = getString("empty_item_text");
 	mParcelMediaName = getString("parcel_media_name");
@@ -142,7 +142,9 @@ BOOL LLPanelNearByMedia::postBuild()
 	mMediaList->setDoubleClickCallback(onZoomMedia, this);
 	mMediaList->sortByColumnIndex(PROXIMITY_COLUMN, TRUE);
 	mMediaList->sortByColumnIndex(VISIBILITY_COLUMN, FALSE);
+	
 	refreshList();
+	updateControls();
 	updateColumns();
 	
 	LLView* minimized_controls = getChildView("minimized_controls");
@@ -234,6 +236,7 @@ void LLPanelNearByMedia::draw()
 	mItemCountText->setValue(llformat(getString("media_item_count_format").c_str(), mMediaList->getItemCount()));
 	
 	refreshList();
+	updateControls();
 	
 	F32 alpha = mHoverTimer.getStarted() 
 		? clamp_rescale(mHoverTimer.getElapsedTimeF32(), AUTO_CLOSE_FADE_TIME_START, AUTO_CLOSE_FADE_TIME_END, 1.f, 0.f)
@@ -527,10 +530,12 @@ void LLPanelNearByMedia::refreshParcelItems()
 			mMediaList->setNeedsSort(true);
 		}
 	}
-	else if (NULL != mParcelMediaItem) {
-		removeListItem(PARCEL_MEDIA_LIST_ITEM_UUID);
-		mParcelMediaItem = NULL;
-		mMediaList->setNeedsSort(true);	
+	else {
+		if (NULL != mParcelMediaItem) {
+			removeListItem(PARCEL_MEDIA_LIST_ITEM_UUID);
+			mParcelMediaItem = NULL;
+			mMediaList->setNeedsSort(true);	
+		}
 	}
 	
 	// ... then update it
@@ -538,7 +543,7 @@ void LLPanelNearByMedia::refreshParcelItems()
 	{
 		std::string name, url, tooltip;
 		getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
-		if (name.empty())
+		if (name.empty() || name == url)
 		{
 			tooltip = url;
 		}
@@ -567,10 +572,12 @@ void LLPanelNearByMedia::refreshParcelItems()
 			mMediaList->setNeedsSort(true);
 		}
 	}
-	else if (NULL != mParcelAudioItem) {
-		removeListItem(PARCEL_AUDIO_LIST_ITEM_UUID);
-		mParcelAudioItem = NULL;
-		mMediaList->setNeedsSort(true);
+	else {
+		if (NULL != mParcelAudioItem) {
+			removeListItem(PARCEL_AUDIO_LIST_ITEM_UUID);
+			mParcelAudioItem = NULL;
+			mMediaList->setNeedsSort(true);
+		}
 	}
 	
 	// ... then update it
@@ -716,12 +723,14 @@ void LLPanelNearByMedia::updateColumns()
 {
 	if (!mDebugInfoVisible)
 	{
+		if (mMediaList->getColumn(CHECKBOX_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(-1);
 		if (mMediaList->getColumn(VISIBILITY_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(-1);
 		if (mMediaList->getColumn(PROXIMITY_COLUMN)) mMediaList->getColumn(PROXIMITY_COLUMN)->setWidth(-1);
 		if (mMediaList->getColumn(CLASS_COLUMN)) mMediaList->getColumn(CLASS_COLUMN)->setWidth(-1);
 		if (mMediaList->getColumn(DEBUG_COLUMN)) mMediaList->getColumn(DEBUG_COLUMN)->setWidth(-1);
 	}
 	else {
+		if (mMediaList->getColumn(CHECKBOX_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(20);
 		if (mMediaList->getColumn(VISIBILITY_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(20);
 		if (mMediaList->getColumn(PROXIMITY_COLUMN)) mMediaList->getColumn(PROXIMITY_COLUMN)->setWidth(30);
 		if (mMediaList->getColumn(CLASS_COLUMN)) mMediaList->getColumn(CLASS_COLUMN)->setWidth(20);
@@ -778,7 +787,7 @@ bool LLPanelNearByMedia::setDisabled(const LLUUID &row_id, bool disabled)
 		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
 		if(impl)
 		{
-			impl->setDisabled(disabled);
+			impl->setDisabled(disabled, true);
 			return true;
 		}
 	}
@@ -794,23 +803,6 @@ void LLPanelNearByMedia::onZoomMedia(void* user_data)
 	LLViewerMediaFocus::getInstance()->focusZoomOnMedia(media_id);
 }
 
-void LLPanelNearByMedia::onClickMuteParcelMedia()
-{
-	if (LLViewerParcelMedia::getParcelMedia())
-	{
-		bool muted = mParcelMediaMuteCtrl->getValue();
-		LLViewerParcelMedia::getParcelMedia()->setVolume(muted ? (F32)0 : mParcelMediaVolumeSlider->getValueF32() );
-	}
-}
-
-void LLPanelNearByMedia::onParcelMediaVolumeSlider()
-{
-	if (LLViewerParcelMedia::getParcelMedia())
-	{
-		LLViewerParcelMedia::getParcelMedia()->setVolume(mParcelMediaVolumeSlider->getValueF32());
-	}
-}
-
 void LLPanelNearByMedia::onClickParcelMediaPlay()
 {
 	LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
@@ -941,7 +933,226 @@ void LLPanelNearByMedia::onMoreLess()
 
 	setShape(new_rect);
 }
+
+void LLPanelNearByMedia::updateControls()
+{
+	LLUUID selected_media_id = mMediaList->getValue().asUUID();
+	
+	if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID)
+	{
+		showTimeBasedControls(LLViewerMedia::isParcelAudioPlaying(),
+							  false, // include_zoom
+							  false, // is_zoomed
+							  gSavedSettings.getBOOL("MuteMusic"), 
+							  gSavedSettings.getF32("AudioLevelMusic") );
+	}
+	else if (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID)
+	{
+		if (!LLViewerMedia::hasParcelMedia())
+		{
+			// Shouldn't happen, but do this anyway
+			showDisabledControls();
+		}
+		else {
+			LLViewerMediaImpl* impl = LLViewerParcelMedia::getParcelMedia();
+			if (NULL == impl)
+			{
+				// Just means it hasn't started yet
+				showBasicControls(false, false, false);
+			}
+			else if (impl->isMediaTimeBased())
+			{
+				showTimeBasedControls(impl->isMediaPlaying(), 
+									  false, // include_zoom
+									  false, // is_zoomed
+									  impl->getVolume() == 0.0,
+									  impl->getVolume() );
+			}
+			else {
+				// non-time-based parcel media
+				showBasicControls(LLViewerMedia::isParcelMediaPlaying(), false, false);
+			}
+		}
+	}
+	else {
+		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
 		
+		if (NULL == impl)
+		{
+			showDisabledControls();
+		}
+		else {
+			if (impl->isMediaTimeBased())
+			{
+				showTimeBasedControls(impl->isMediaPlaying(), 
+									  ! impl->isParcelMedia(),  // include_zoom
+									  LLViewerMediaFocus::getInstance()->isZoomed(),
+									  impl->getVolume() == 0.0,
+									  impl->getVolume());
+			}
+			else {
+				showBasicControls(!impl->isMediaDisabled(), 
+								  ! impl->isParcelMedia(),  // include_zoom
+								  LLViewerMediaFocus::getInstance()->isZoomed());
+			}
+		}
+	}
+}
+
+void LLPanelNearByMedia::showBasicControls(bool playing, bool include_zoom, bool is_zoomed)
+{
+	mStopCtrl->setVisible(playing);
+	mPlayCtrl->setVisible(!playing);
+	mPauseCtrl->setVisible(false);
+	mMuteCtrl->setVisible(false);
+	mVolumeSliderCtrl->setVisible(false);
+	mZoomCtrl->setVisible(include_zoom && !is_zoomed);
+	mUnzoomCtrl->setVisible(include_zoom && is_zoomed);	
+	mStopCtrl->setEnabled(true);
+	mZoomCtrl->setEnabled(true);
+}
+
+void LLPanelNearByMedia::showTimeBasedControls(bool playing, bool include_zoom, bool is_zoomed, bool muted, F32 volume)
+{
+	mStopCtrl->setVisible(true);
+	mPlayCtrl->setVisible(!playing);
+	mPauseCtrl->setVisible(playing);
+	mMuteCtrl->setVisible(true);
+	mVolumeSliderCtrl->setVisible(true);
+	mZoomCtrl->setVisible(include_zoom);
+	mZoomCtrl->setVisible(include_zoom && !is_zoomed);
+	mUnzoomCtrl->setVisible(include_zoom && is_zoomed);	
+	mStopCtrl->setEnabled(true);
+	mZoomCtrl->setEnabled(true);
+	mMuteBtn->setValue(muted);
+	mVolumeSlider->setValue(volume);
+}
+
+void LLPanelNearByMedia::showDisabledControls()
+{
+	mStopCtrl->setVisible(true);
+	mPlayCtrl->setVisible(false);
+	mPauseCtrl->setVisible(false);
+	mMuteCtrl->setVisible(false);
+	mVolumeSliderCtrl->setVisible(false);
+	mZoomCtrl->setVisible(true);
+	mUnzoomCtrl->setVisible(false);	
+	mStopCtrl->setEnabled(false);
+	mZoomCtrl->setEnabled(false);
+}
+
+void LLPanelNearByMedia::onClickSelectedMediaStop()
+{
+	setDisabled(mMediaList->getValue().asUUID(), true);
+}
+
+void LLPanelNearByMedia::onClickSelectedMediaPlay()
+{
+	LLUUID selected_media_id = mMediaList->getValue().asUUID();
+	
+	// First enable it
+	setDisabled(selected_media_id, false);
+	
+	// Special code to make play "unpause" if time-based and playing
+	if (selected_media_id != PARCEL_AUDIO_LIST_ITEM_UUID)
+	{
+		LLViewerMediaImpl *impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ?
+			((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
+		if (NULL != impl && impl->isMediaTimeBased() && impl->isMediaPaused())
+		{
+			// Aha!  It's really time-based media that's paused, so unpause
+			impl->play();
+			return;
+		}
+		else if (impl->isParcelMedia())
+		{
+			LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
+		}
+	}	
+}
+
+void LLPanelNearByMedia::onClickSelectedMediaPause()
+{
+	LLUUID selected_media_id = mMediaList->getValue().asUUID();
+	if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID)
+	{
+		onClickParcelAudioPause();
+	}
+	else if (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) 
+	{
+		onClickParcelMediaPause();
+	}
+	else {
+		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
+		if (NULL != impl && impl->isMediaTimeBased() && impl->isMediaPlaying())
+		{
+			impl->pause();
+		}
+	}
+}
+
+void LLPanelNearByMedia::onClickSelectedMediaMute()
+{
+	LLUUID selected_media_id = mMediaList->getValue().asUUID();
+	if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID)
+	{
+		gSavedSettings.setBOOL("MuteMusic", mMuteBtn->getValue());
+	}
+	else {
+		LLViewerMediaImpl* impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ?
+			((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
+		if (NULL != impl && impl->isMediaTimeBased())
+		{
+			F32 volume = impl->getVolume();
+			if(volume > 0.0)
+			{
+				impl->setVolume(0.0);
+			}
+			else if (mVolumeSlider->getValueF32() == 0.0)
+			{
+				impl->setVolume(1.0);
+				mVolumeSlider->setValue(1.0);
+			}
+			else 
+			{
+				impl->setVolume(mVolumeSlider->getValueF32());
+			}
+		}
+	}
+}
+
+void LLPanelNearByMedia::onCommitSelectedMediaVolume()
+{
+	LLUUID selected_media_id = mMediaList->getValue().asUUID();
+	if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID)
+	{
+		F32 vol = mVolumeSlider->getValueF32();
+		gSavedSettings.setF32("AudioLevelMusic", vol);
+	}
+	else {
+		LLViewerMediaImpl* impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ?
+			((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
+		if (NULL != impl && impl->isMediaTimeBased())
+		{
+			impl->setVolume(mVolumeSlider->getValueF32());
+		}
+	}
+}
+
+void LLPanelNearByMedia::onClickSelectedMediaZoom()
+{
+	LLUUID selected_media_id = mMediaList->getValue().asUUID();
+	if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID || selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID)
+		return;
+	LLViewerMediaFocus::getInstance()->focusZoomOnMedia(selected_media_id);
+}
+
+void LLPanelNearByMedia::onClickSelectedMediaUnzoom()
+{
+	LLViewerMediaFocus::getInstance()->unZoom();
+}
+
+
 // static
 void LLPanelNearByMedia::getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName)
 {
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
index 654a8544af..eedfd447de 100644
--- a/indra/newview/llpanelnearbymedia.h
+++ b/indra/newview/llpanelnearbymedia.h
@@ -38,6 +38,7 @@
 class LLPanelNearbyMedia;
 class LLButton;
 class LLScrollListCtrl;
+class LLSlider;
 class LLSliderCtrl;
 class LLCheckBoxCtrl;
 class LLTextBox;
@@ -134,23 +135,37 @@ private:
 	
 	bool shouldShow(LLViewerMediaImpl* impl);
 	
+	void showBasicControls(bool playing, bool include_zoom, bool is_zoomed);
+	void showTimeBasedControls(bool playing, bool include_zoom, bool is_zoomed, bool muted, F32 volume);
+	void showDisabledControls();
+	void updateControls();
+	
+	void onClickSelectedMediaStop();
+	void onClickSelectedMediaPlay();
+	void onClickSelectedMediaPause();
+	void onClickSelectedMediaMute();
+	void onCommitSelectedMediaVolume();
+	void onClickSelectedMediaZoom();
+	void onClickSelectedMediaUnzoom();
+	
 	LLUICtrl*			mNearbyMediaPanel;
-	LLScrollListCtrl*	mMediaList;
+	LLTextBox*			mItemCountText;
+	LLScrollListCtrl*		mMediaList;
 	LLUICtrl*			mEnableAllCtrl;
 	LLUICtrl*			mDisableAllCtrl;
-	LLSliderCtrl*		mParcelMediaVolumeSlider;
-	LLButton*			mParcelMediaMuteCtrl;
-	LLUICtrl*			mEnableParcelMediaCtrl;
-	LLUICtrl*			mDisableParcelMediaCtrl;
-	LLTextBox*			mItemCountText;
-	LLUICtrl*			mParcelMediaCtrl;
-	LLUICtrl*			mParcelMediaPlayCtrl;
-	LLUICtrl*			mParcelMediaPauseCtrl;
-	LLUICtrl*			mParcelAudioCtrl;
-	LLUICtrl*			mParcelAudioPlayCtrl;
-	LLUICtrl*			mParcelAudioPauseCtrl;
 	LLComboBox*			mShowCtrl;
 	
+	// Dynamic (selection-dependent) controls
+	LLUICtrl*			mStopCtrl;
+	LLUICtrl*			mPlayCtrl;
+	LLUICtrl*			mPauseCtrl;
+	LLUICtrl*			mMuteCtrl;
+	LLUICtrl*			mVolumeSliderCtrl;
+	LLUICtrl*			mZoomCtrl;
+	LLUICtrl*			mUnzoomCtrl;
+	LLSlider*			mVolumeSlider;
+	LLButton*			mMuteBtn;
+	
 	bool				mAllMediaDisabled;
 	bool				mDebugInfoVisible;
 	bool				mParcelAudioAutoStart;
@@ -159,11 +174,11 @@ private:
 	std::string			mParcelMediaName;
 	std::string			mParcelAudioName;
 	
-	S32					mMoreHeight;
-	S32					mLessHeight;
-	LLFrameTimer		mHoverTimer;
-	LLScrollListItem*	mParcelMediaItem;
-	LLScrollListItem*	mParcelAudioItem;
+	S32				mMoreHeight;
+	S32				mLessHeight;
+	LLFrameTimer			mHoverTimer;
+	LLScrollListItem*		mParcelMediaItem;
+	LLScrollListItem*		mParcelAudioItem;
 };
 
 
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h
index 743cec70a1..2e0de7866c 100644
--- a/indra/newview/llpanelprimmediacontrols.h
+++ b/indra/newview/llpanelprimmediacontrols.h
@@ -58,6 +58,16 @@ public:
 	
 	void updateShape();
 	bool isMouseOver();
+	
+	enum EZoomLevel
+	{
+		ZOOM_NONE = 0,
+		ZOOM_FAR,
+		ZOOM_MEDIUM,
+		ZOOM_NEAR
+	};
+	
+	EZoomLevel getZoomLevel() const { return mCurrentZoom; }
 	void nextZoomLevel();
 	void resetZoomLevel(bool reset_camera = true);
 	void close();
@@ -66,13 +76,6 @@ public:
 	void setMediaFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero);
 
 
-	enum EZoomLevel
-	{
-		ZOOM_NONE = 0,
-		ZOOM_FAR,
-		ZOOM_MEDIUM,
-		ZOOM_NEAR
-	};
 	static const EZoomLevel kZoomLevels[];
 	static const int kNumZoomLevels;
 	
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 7b5d1d9814..3fc578aa5e 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -939,12 +939,12 @@ void LLViewerMedia::setAllMediaEnabled(bool val)
 	// Also do Parcel Media and Parcel Audio
 	if (val)
 	{
-		if (!LLViewerMedia::isParcelMediaPlaying())
+		if (!LLViewerMedia::isParcelMediaPlaying() && LLViewerMedia::hasParcelMedia())
 		{	
 			LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
 		}
 		
-		if (!LLViewerMedia::isParcelAudioPlaying() && gAudiop)
+		if (!LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio())
 		{
 			gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
 		}
@@ -2246,7 +2246,7 @@ void LLViewerMediaImpl::resetPreviousMediaState()
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //
-void LLViewerMediaImpl::setDisabled(bool disabled)
+void LLViewerMediaImpl::setDisabled(bool disabled, bool forcePlayOnEnable)
 {
 	if(mIsDisabled != disabled)
 	{
@@ -2261,7 +2261,7 @@ void LLViewerMediaImpl::setDisabled(bool disabled)
 		else
 		{
 			// We just (re)enabled this media.  Do a navigate if auto-play is in order.
-			if(isAutoPlayable())
+			if(isAutoPlayable() || forcePlayOnEnable)
 			{
 				navigateTo(mMediaEntryURL, "", true, true);
 			}
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index ec25744fa2..9dbffa78b3 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -230,7 +230,7 @@ public:
 	void setMediaFailed(bool val) { mMediaSourceFailed = val; }
 	void resetPreviousMediaState();
 	
-	void setDisabled(bool disabled);
+	void setDisabled(bool disabled, bool forcePlayOnEnable = false);
 	bool isMediaDisabled() const { return mIsDisabled; };
 	
 	void setInNearbyMediaList(bool in_list) { mInNearbyMediaList = in_list; }
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index f508a3462a..88e7cfec86 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -559,6 +559,19 @@ void LLViewerMediaFocus::focusZoomOnMedia(LLUUID media_id)
 	}
 }
 
+void LLViewerMediaFocus::unZoom()
+{
+	if(mMediaControls.get())
+	{
+		mMediaControls.get()->resetZoomLevel();
+	}
+}
+
+bool LLViewerMediaFocus::isZoomed() const
+{
+	return (mMediaControls.get() && mMediaControls.get()->getZoomLevel() != LLPanelPrimMediaControls::ZOOM_NONE);
+}
+
 LLUUID LLViewerMediaFocus::getControlsMediaID()
 {
 	if(getFocusedMediaImpl())
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h
index 002044ea2e..d9ddc7432b 100644
--- a/indra/newview/llviewermediafocus.h
+++ b/indra/newview/llviewermediafocus.h
@@ -85,6 +85,9 @@ public:
 	
 	// Try to focus/zoom on the specified media (if it's on an object in world).
 	void focusZoomOnMedia(LLUUID media_id);
+	// Are we zoomed in?
+	bool isZoomed() const;
+	void unZoom();
 	
 	// Return the ID of the media instance the controls are currently attached to (either focus or hover).
 	LLUUID getControlsMediaID();
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 0c0936c103..1f6bbcbae8 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1800,7 +1800,8 @@ void optionally_start_music(const std::string& music_url)
 		     nearby_media_panel->getParcelAudioAutoStart()) ||
 		    // or they have expressed no opinion in the UI, but have autoplay on...
 		    (!nearby_media_panel &&
-		     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)))
+		     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
+			 gSavedSettings.getBOOL("MediaTentativeAutoPlay")))
 		{
 			llinfos << "Starting parcel music " << music_url << llendl;
 			gAudiop->startInternetStream(music_url);
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 f332ab273d..4a71be370e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,11 +2,11 @@
 <panel
 	can_resize="true"
 	can_close="false"
-  	background_opaque="true"
-  	background_visible="true"
+	background_opaque="true"
+	background_visible="true"
 	layout="topleft"
 	width="270"
-	height="290"
+	height="325"
 	name="nearby_media"
 	help_topic="nearby_media">
   <string name="media_item_count_format">(%ld media items)</string>
@@ -14,241 +14,463 @@
   <string name="parcel_media_name">Parcel Streaming Media</string>
   <string name="parcel_audio_name">Parcel Streaming Audio</string>
   <string name="playing_suffix">(playing)</string>
-	<panel
-		bevel_style="in"
-		bg_alpha_color="0 0 0 0"
-		bg_opaque_color="0 0 0 0.3"
-    bg_opaque_image="Toast_Background"  
-    follows="left|right|top"
-		top="0"
-		height="30"
-    name="minimized_controls" 
-		left="0">
-	  <button
-		  name="all_nearby_media_disable_btn"
-		  follows="left"
-		  tool_tip="Turn all nearby media off"
+  <panel
+	  bevel_style="in"
+	  bg_alpha_color="0 0 0 0"
+	  bg_opaque_color="0 0 0 0.3"
+	  bg_opaque_image="Toast_Background"  
+	  follows="left|right|top"
+	  top="0"
+	  height="30"
+	  name="minimized_controls" 
+	  left="0">
+	<button
+		name="all_nearby_media_disable_btn"
+		follows="left"
+		tool_tip="Turn all nearby media off"
 		left="15"
 		width="60"
-		  height="22"
+		height="22"
 		label="Stop All">
-		<button.commit_callback
-			function="MediaListCtrl.DisableAll" />
-	  </button>
-	  <button
+	  <button.commit_callback
+		  function="MediaListCtrl.DisableAll" />
+	</button>
+	<button
 		name="all_nearby_media_enable_btn"
-		  follows="left"
+		follows="left"
 		tool_tip="Turn all nearby media on"
-		  left_pad="4"
+		left_pad="4"
 		width="60"
-		  height="22"
+		height="22"
 		label="Start All">
-		<button.commit_callback
+	  <button.commit_callback
 		  function="MediaListCtrl.EnableAll" />
-	  </button>
-	  <button
+	</button>
+	<button
 		name="open_prefs_btn"
 		image_overlay="Icon_Gear_Foreground"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
+		image_disabled="PushButton_Disabled"
+		image_disabled_selected="PushButton_Disabled"
+		image_selected="PushButton_Selected"
+		image_unselected="PushButton_Off"
+		hover_glow_amount="0.15"
 		tool_tip = "Bring up media prefs"
 		top_delta="0"
 		left_pad="4"
-		  height="22"
+		height="22"
 		min_width="28"
 		width="28">
-		<button.commit_callback
+	  <button.commit_callback
 		  function="MediaListCtrl.GoMediaPrefs" />
-	  </button>
-	  <button
+	</button>
+	<button
 		name="more_less_btn"
 		follows="right"
 		tool_tip="Advanced Controls"
 		top_delta="0"
 		right="-10"
 		width="60"
-		  height="22"
+		height="22"
 		toggle="true"
 		label="More &gt;&gt;"
 		label_selected="Less &lt;&lt;">
-		<button.commit_callback
+	  <button.commit_callback
 		  function="MediaListCtrl.MoreLess" />
-	  </button>
-	</panel>
-	<panel
+	</button>
+  </panel>
+  <panel
 	  name="nearby_media_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"
+	  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="30"
-		right="-1"
-		left="0"
-	  height="230">
-	  <text
-		  type="string"
-		  length="1"
+	  right="-1"
+	  left="0"
+	  height="295">
+	<text
+		type="string"
+		length="1"
 		follows="top|left"
 		font="SansSerif"
 		left="10"
 		width="100">
-		Nearby Media
-	  </text>
-<!-- nix for now
-	  <text
-		bottom_delta="1"
-		  type="string"
-		  follows="top|left|right"
-		  font="SansSerif"
-		font.style="ITALIC"
-		  font.size="Small"
-		name="media_item_count"
-		left="115"
-		right="-10">
-	  (?? media items)
-	  </text>
--->
-	  <text
-		  type="string"
-		  length="1"
+	  Nearby Media
+	</text>
+	<!-- nix for now
+		 <text
+		 bottom_delta="1"
+		 type="string"
+		 follows="top|left|right"
+		 font="SansSerif"
+		 font.style="ITALIC"
+		 font.size="Small"
+		 name="media_item_count"
+		 left="115"
+		 right="-10">
+		 (?? media items)
+		 </text>
+	-->
+	<text
+		type="string"
+		length="1"
 		follows="top|left"
-		  font="SansSerif"
-		  top_pad="15"
+		font="SansSerif"
+		top_pad="15"
 		left="10"
 		width="40">
-		Show:
-	  </text>
-	  <combo_box
-		  height="23"
-		  left="50"
+	  Show:
+	</text>
+	<combo_box
+		height="23"
+		left="50"
 		width="140"
-		  top_delta="-5"
+		top_delta="-5"
 		follows="left|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"
+		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="100"
-		  draw_heading="false"
-		  draw_stripes="true"
-		  bg_stripe_color="0.25 0.25 0.25 0.25"
-		  top_pad="8"
+		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="-1"
+		  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
+		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="5"
+		height="30"
+		left="10"
+		right="-10">
+	  <layout_stack
+		  name="media_controls"
+		  follows="left|right|top"
+		  animate="false"
+		  height="75"
+		  layout="topleft"
+		  top="4"
 		  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
-		  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"
+		  border_size="0"
+		  mouse_opaque="false"
+		  orientation="horizontal">
+		<layout_panel
+			name="stop"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false"
+			layout="topleft"
+			top="0"
+			height="22"
+			min_width="22"
+			width="22">
+		  <button
+			  name="stop_btn"
+			  follows="top"
+			  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"
+			  layout="topleft"
+			  tool_tip="Stop selected media"
+			  top="0"
+			  height="22"
+			  width="22">
+			<button.commit_callback
+				function="SelectedMediaCtrl.Stop" />
+		  </button>
+		</layout_panel>
+		<layout_panel
+			name="play"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false"
+			layout="topleft"
+			top="0"
+			height="22"
+			min_width="22"
+			width="22">
+		  <button
+			  name="play_btn"
+			  follows="top"
+			  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"
+			  layout="topleft"
+			  tool_tip = "Play selected media"
+			  top="0"
+			  height="22"
+			  width="22">
+			<button.commit_callback
+				function="SelectedMediaCtrl.Play" />
+		  </button>
+		</layout_panel>
+		<layout_panel
+			name="pause"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false"
+			layout="topleft"
+			top="0"
+			min_width="22"
+			width="22">
+		  <button
+			  name="pause_btn"
+			  follows="top"
+			  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"
+			  layout="topleft"
+			  top="0"
+			  height="22"
+			  width="22"
+			  tool_tip = "Pause selected media">
+			<button.commit_callback
+				function="SelectedMediaCtrl.Pause" />
+		  </button>
+		</layout_panel>
+		<layout_panel
+			name="volume_slider_ctrl"
+			mouse_opaque="false"
+			auto_resize="true"
+			user_resize="false"
+			follows="left|right"
+			layout="topleft"
+			top="0"
+			height="22"
+			min_width="100"
+			width="200">
+		  <slider_bar
+			  name="volume_slider"
+			  follows="left|right|top"
+			  top="0"
+			  height="22"
+			  increment="0.01"
+			  initial_value="0.5"
+			  layout="topleft"
+			  tool_tip="Audio volume for selected media"
+			  width="200">
+			<slider_bar.commit_callback
+				function="SelectedMediaCtrl.Volume" />
+		  </slider_bar>
+		</layout_panel>
+		<layout_panel
+			name="mute"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false"
+			layout="topleft"
+			top="0"
+			height="72"
+			min_width="22"
+			width="22">
+		  <button
+			  name="mute_btn"
+			  follows="top"
+			  image_disabled="PushButton_Disabled"
+			  image_disabled_selected="PushButton_Disabled"
+			  image_selected="AudioMute_Off"
+			  image_unselected="Audio_Off"
+			  hover_glow_amount="0.15"
+			  is_toggle="true"
+			  layout="topleft"
+			  scale_image="false" 
+			  tool_tip="Mute audio on selected media"
+			  top="0"
+			  height="20"
+			  width="22" >
+			<button.commit_callback
+				function="SelectedMediaCtrl.Mute" />
+		  </button>
+		</layout_panel>
+		<layout_panel
+			name="zoom"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false"
+			layout="topleft"
+			top="0"
+			height="28"
+			min_width="22"
+			width="22">
+		  <button
+			  name="zoom_btn"
+			  follows="top"
+			  image_overlay="Zoom_Off"
+			  image_disabled="PushButton_Disabled"
+			  image_disabled_selected="PushButton_Disabled"
+			  image_selected="PushButton_Selected"
+			  image_unselected="PushButton_Off"
+			  hover_glow_amount="0.15"
+			  top="0"
+			  height="22"
+			  layout="topleft"
+			  tool_tip="Zoom into selected media"
+			  width="22">
+			<button.commit_callback
+				function="SelectedMediaCtrl.Zoom" />
+		  </button>
+		</layout_panel>
+		<layout_panel
+			name="unzoom"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false"
+			layout="topleft"
+			top="0"
+			min_width="21"
+			width="21" >
+		  <button
+			  name="unzoom_btn"
+			  follows="top"
+			  image_overlay="UnZoom_Off"
+			  image_disabled="PushButton_Disabled"
+			  image_disabled_selected="PushButton_Disabled"
+			  image_selected="PushButton_Selected"
+			  image_unselected="PushButton_Off"
+			  hover_glow_amount="0.15"
+			  top="0"
+			  height="22"
+			  layout="topleft"
+			  tool_tip ="Zoom back from selected media"
+			  top_delta="-4"
+			  width="21" >
+			<button.commit_callback
+				function="SelectedMediaCtrl.Unzoom" />
+		  </button>
+		</layout_panel>
+		<layout_panel
+			name="right_bookend"
+			width="0"
+			mouse_opaque="false"
+			user_resize="false" />
+	  </layout_stack>
+	</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="5"
+		height="90"
+		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"/>
+	  <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"
-		  height="90"
-		  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"/>
-		<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"/>
-<!--
-		<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"/>
--->
-		<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"/>
-		<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"/>
-	  </panel>
+		  left="10"/>
+	  <!--
+		  <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"/>
+	  -->
+	  <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"/>
+	  <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"/>
 	</panel>
   </panel>
+</panel>
-- 
cgit v1.3