diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-14 17:46:53 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-14 17:46:53 -0500 |
commit | f125039abcb566eaa7bdf33ce9c8c550cc25783a (patch) | |
tree | af4d577b9559855177bd0e24f95ee90976e6e8e0 /indra/newview/llpanelprimmediacontrols.h | |
parent | 4cc5f81ddf0b9a190235e8946d7e438499d91639 (diff) | |
parent | 93f827ec7855c419c19dbf1a055e7cdc546eb650 (diff) |
merge with avatar-pipeline
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
-rw-r--r-- | indra/newview/llpanelprimmediacontrols.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 06163051a5..17e65b8b0c 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -153,7 +153,7 @@ private: LLUICtrl *mMediaPlaySliderPanel; LLUICtrl *mMediaPlaySliderCtrl; LLUICtrl *mVolumeCtrl; - LLButton *mVolumeBtn; + LLButton *mMuteBtn; LLUICtrl *mVolumeUpCtrl; LLUICtrl *mVolumeDownCtrl; LLSliderCtrl *mVolumeSliderCtrl; |