1 files changed, 31 insertions, 33 deletions

diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 811d70ade3..93ebae334f 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -2,25 +2,31 @@
  * @file llpanelnearbymedia.cpp
  * @brief Management interface for muting and controlling nearby media
  *
- * $LicenseInfo:firstyear=2005&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
 
@@ -218,8 +224,8 @@ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	LLPanel::reshape(width, height, called_from_parent);
 
-	LLButton* more_btn = findChild<LLButton>("more_btn");
-	if (more_btn && more_btn->getValue().asBoolean())
+	LLButton* more_less_btn = getChild<LLButton>("more_less_btn");
+	if (more_less_btn->getValue().asBoolean())
 	{
 		mMoreRect = getRect();
 	}
@@ -1004,7 +1010,7 @@ void LLPanelNearByMedia::updateControls()
 			if (NULL == impl)
 			{
 				// Just means it hasn't started yet
-				showBasicControls(false, false, false, false, 0);
+				showBasicControls(false, false, false);
 			}
 			else if (impl->isMediaTimeBased())
 			{
@@ -1016,11 +1022,7 @@ void LLPanelNearByMedia::updateControls()
 			}
 			else {
 				// non-time-based parcel media
-				showBasicControls(LLViewerMedia::isParcelMediaPlaying(), 
-							      false, 
-								  false, 
-								  impl->getVolume() == 0.0, 
-								  impl->getVolume());
+				showBasicControls(LLViewerMedia::isParcelMediaPlaying(), false, false);
 			}
 		}
 	}
@@ -1043,23 +1045,19 @@ void LLPanelNearByMedia::updateControls()
 			else {
 				showBasicControls(!impl->isMediaDisabled(), 
 								  ! impl->isParcelMedia(),  // include_zoom
-								  LLViewerMediaFocus::getInstance()->isZoomed(),
-								  impl->getVolume() == 0.0,
-								  impl->getVolume());
+								  LLViewerMediaFocus::getInstance()->isZoomed());
 			}
 		}
 	}
 }
 
-void LLPanelNearByMedia::showBasicControls(bool playing, bool include_zoom, bool is_zoomed, bool muted, F32 volume)
+void LLPanelNearByMedia::showBasicControls(bool playing, bool include_zoom, bool is_zoomed)
 {
 	mStopCtrl->setVisible(playing);
 	mPlayCtrl->setVisible(!playing);
 	mPauseCtrl->setVisible(false);
-	mVolumeSliderCtrl->setVisible(true);
-	mMuteCtrl->setVisible(true);
-	mMuteBtn->setValue(muted);
-	mVolumeSlider->setValue(volume);
+	mMuteCtrl->setVisible(false);
+	mVolumeSliderCtrl->setVisible(false);
 	mZoomCtrl->setVisible(include_zoom && !is_zoomed);
 	mUnzoomCtrl->setVisible(include_zoom && is_zoomed);	
 	mStopCtrl->setEnabled(true);
@@ -1158,7 +1156,7 @@ void LLPanelNearByMedia::onClickSelectedMediaMute()
 	else {
 		LLViewerMediaImpl* impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ?
 			((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
-		if (NULL != impl)
+		if (NULL != impl && impl->isMediaTimeBased())
 		{
 			F32 volume = impl->getVolume();
 			if(volume > 0.0)
@@ -1189,7 +1187,7 @@ void LLPanelNearByMedia::onCommitSelectedMediaVolume()
 	else {
 		LLViewerMediaImpl* impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ?
 			((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
-		if (NULL != impl)
+		if (NULL != impl && impl->isMediaTimeBased())
 		{
 			impl->setVolume(mVolumeSlider->getValueF32());
 		}