livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-6856 Display per media volume control 

reviewed by Richard cc#189
meow-7.2.2
Leyla Farazha 2010-04-14 18:11:51 -07:00
parent 8dd6286309
commit 10b5c10310
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanelprimmediacontrols.cpp
View File

@ -31,7 +31,6 @@
#include "llviewerprecompiledheaders.h"
//LLPanelPrimMediaControls
#include "llagent.h"
#include "llagentcamera.h"
#include "llparcel.h"
@ -65,9 +64,12 @@
#include "llvovolume.h"
#include "llweb.h"
#include "llwindow.h"
#include "llfloatertools.h" // to enable hide if build tools are up
#if defined(LL_DARWIN) || (defined(LL_WINDOW) && (! defined(LL_RELEASE_FOR_DOWNLOAD)) )
#define PER_MEDIA_VOLUME
#endif
// Functions pulled from pipeline.cpp
glh::matrix4f glh_get_current_modelview();
glh::matrix4f glh_get_current_projection();
@ -464,11 +466,18 @@ void LLPanelPrimMediaControls::updateShape()
mSkipBackCtrl->setVisible(FALSE);
mSkipBackCtrl->setEnabled(FALSE);
#ifdef PER_MEDIA_VOLUME
mVolumeCtrl->setVisible(has_focus);
mVolumeCtrl->setEnabled(has_focus);
mVolumeSliderCtrl->setEnabled(has_focus && shouldVolumeSliderBeVisible());
mVolumeSliderCtrl->setVisible(has_focus && shouldVolumeSliderBeVisible());
#else
mVolumeCtrl->setVisible(FALSE);
mVolumeSliderCtrl->setVisible(FALSE);
mVolumeCtrl->setEnabled(FALSE);
mVolumeSliderCtrl->setEnabled(FALSE);
#endif
if (mMediaPanelScroll)
{
mMediaPanelScroll->setVisible(has_focus);