diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-03 14:34:03 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-03 14:34:03 -0800 |
| commit | d9a22f6678a519045ae45cc6b927ce319aefc686 (patch) | |
| tree | 436b76106fdac62a371cfb8d0c55f7514f8364ad /indra/newview/llpanelprimmediacontrols.h | |
| parent | 4535fd64fbee1ee0dd3bfe54c090cfa9c56a11b6 (diff) | |
| parent | cfe5ac7684d40032c3d6c83742a64463bf0f15ad (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index fe8f100abe..06163051a5 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -40,6 +40,7 @@ class LLCoordWindow; class LLIconCtrl; class LLLayoutStack; class LLProgressBar; +class LLSliderCtrl; class LLViewerMediaImpl; class LLPanelPrimMediaControls : public LLPanel @@ -106,7 +107,9 @@ private: void onCommitVolumeUp(); void onCommitVolumeDown(); + void onCommitVolumeSlider(); void onToggleMute(); + void showVolumeSlider(); static void onScrollUp(void* user_data); static void onScrollUpHeld(void* user_data); @@ -153,12 +156,14 @@ private: LLButton *mVolumeBtn; LLUICtrl *mVolumeUpCtrl; LLUICtrl *mVolumeDownCtrl; + LLSliderCtrl *mVolumeSliderCtrl; LLIconCtrl *mWhitelistIcon; LLIconCtrl *mSecureLockIcon; LLLayoutStack *mMediaControlsStack; LLUICtrl *mLeftBookend; LLUICtrl *mRightBookend; LLUIImage* mBackgroundImage; + LLUIImage* mVolumeSliderBackgroundImage; F32 mSkipStep; S32 mMinWidth; S32 mMinHeight; @@ -198,6 +203,8 @@ private: LLUUID mZoomObjectID; S32 mZoomObjectFace; + + bool mVolumeSliderVisible; }; #endif // LL_PANELPRIMMEDIACONTROLS_H |