diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/newview/llpanellandaudio.cpp | |
parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanellandaudio.cpp')
-rw-r--r-- | indra/newview/llpanellandaudio.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp index 6a4c909759..a92b4357ed 100644 --- a/indra/newview/llpanellandaudio.cpp +++ b/indra/newview/llpanellandaudio.cpp @@ -153,6 +153,13 @@ void LLPanelLandAudio::refresh() mCheckParcelEnableVoice->set(allow_voice); mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel()); + // don't display urls if you're not able to change it + // much requested change in forums so people can't 'steal' urls + // NOTE: bug#2009 means this is still vunerable - however, bug + // should be closed since this bug opens up major security issues elsewhere. + bool obscure_music = ! can_change_media && parcel->getObscureMusic(); + + mMusicURLEdit->setDrawAsterixes(obscure_music); mMusicURLEdit->setText(parcel->getMusicURL()); mMusicURLEdit->setEnabled( can_change_media ); } |