diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 13:38:54 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 13:38:54 -0800 |
commit | c0f087eb8672c3e8c6615b7700e6255b78efed65 (patch) | |
tree | 883146dd944c52a420a8294f3fd302702d2af828 /indra/newview/llpanelprimmediacontrols.h | |
parent | 7590704e0e93b48f897c47dba07916efebd95274 (diff) | |
parent | 4858789050411a152a35685f1e0282061800faeb (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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 419f033628..743cec70a1 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -156,8 +156,6 @@ private: LLUICtrl *mMediaPlaySliderCtrl; LLUICtrl *mVolumeCtrl; LLButton *mMuteBtn; - LLUICtrl *mVolumeUpCtrl; - LLUICtrl *mVolumeDownCtrl; LLSliderCtrl *mVolumeSliderCtrl; LLIconCtrl *mWhitelistIcon; LLIconCtrl *mSecureLockIcon; |