diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
| commit | ae464867e6714816cd5bdaeecdd1d3c0a0817e58 (patch) | |
| tree | 02830da2f640dab402a7e7222b4f0aa6eca930b2 /indra/newview/llpanellandmedia.cpp | |
| parent | 40d2bb564d35809d7735d2ec06ba988db7327020 (diff) | |
svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
Diffstat (limited to 'indra/newview/llpanellandmedia.cpp')
| -rw-r--r-- | indra/newview/llpanellandmedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index 34a4ad3954..3d38421ed4 100644 --- a/indra/newview/llpanellandmedia.cpp +++ b/indra/newview/llpanellandmedia.cpp @@ -150,9 +150,9 @@ void LLPanelLandMedia::refresh() mCheckSoundLocal->set( parcel->getSoundLocal() ); mCheckSoundLocal->setEnabled( can_change_media ); - if(parcel->getVoiceEnabled()) + if(parcel->getParcelFlagAllowVoice()) { - if(parcel->getVoiceUseEstateChannel()) + if(parcel->getParcelFlagUseEstateVoiceChannel()) mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatEstate); else mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatPrivate); |