diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-22 16:19:11 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-22 16:19:11 +0200 |
| commit | ad501d7fab624c7a85a70fb66e3e24667984f880 (patch) | |
| tree | 2d5fcb404302f849e72db08ebd9664c1825ecc52 /indra/newview/llpanellandaudio.h | |
| parent | 74429f2ed926362a2ec47d590fc862b55b26f0f8 (diff) | |
| parent | bc0ed2a02b42ae485b2f7a08f6ec3a0c1ab85778 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellandaudio.h')
| -rw-r--r-- | indra/newview/llpanellandaudio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanellandaudio.h b/indra/newview/llpanellandaudio.h index de5da95fa4..19766a40b6 100644 --- a/indra/newview/llpanellandaudio.h +++ b/indra/newview/llpanellandaudio.h @@ -52,7 +52,9 @@ private: private: LLCheckBoxCtrl* mCheckSoundLocal; - LLRadioGroup* mRadioVoiceChat; + LLCheckBoxCtrl* mCheckParcelEnableVoice; + LLCheckBoxCtrl* mCheckEstateDisabledVoice; + LLCheckBoxCtrl* mCheckParcelVoiceLocal; LLLineEditor* mMusicURLEdit; LLCheckBoxCtrl* mMusicUrlCheck; |