summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandaudio.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanellandaudio.cpp')
-rw-r--r--indra/newview/llpanellandaudio.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp
index 9e3fc54477..706bf02df2 100644
--- a/indra/newview/llpanellandaudio.cpp
+++ b/indra/newview/llpanellandaudio.cpp
@@ -74,7 +74,7 @@ LLPanelLandAudio::~LLPanelLandAudio()
}
-BOOL LLPanelLandAudio::postBuild()
+bool LLPanelLandAudio::postBuild()
{
mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
childSetCommitCallback("check sound local", onCommitAny, this);
@@ -100,7 +100,7 @@ BOOL LLPanelLandAudio::postBuild()
mCheckObscureMOAP = getChild<LLCheckBoxCtrl>("obscure_moap");
childSetCommitCallback("obscure_moap", onCommitAny, this);
- return TRUE;
+ return true;
}
@@ -118,7 +118,7 @@ void LLPanelLandAudio::refresh()
// something selected, hooray!
// Display options
- BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
+ bool can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
mCheckSoundLocal->set( parcel->getSoundLocal() );
mCheckSoundLocal->setEnabled( can_change_media );
@@ -154,7 +154,7 @@ void LLPanelLandAudio::refresh()
mMusicURLEdit->setText(parcel->getMusicURL());
mMusicURLEdit->setEnabled( can_change_media );
- BOOL can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();
+ bool can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();
mCheckAVSoundAny->set(parcel->getAllowAnyAVSounds());
mCheckAVSoundAny->setEnabled(can_change_av_sounds);
@@ -177,14 +177,14 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
}
// Extract data from UI
- BOOL sound_local = self->mCheckSoundLocal->get();
+ bool sound_local = self->mCheckSoundLocal->get();
std::string music_url = self->mMusicURLEdit->getText();
- BOOL voice_enabled = self->mCheckParcelEnableVoice->get();
- BOOL voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
+ bool voice_enabled = self->mCheckParcelEnableVoice->get();
+ bool voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
- BOOL any_av_sound = self->mCheckAVSoundAny->get();
- BOOL group_av_sound = TRUE; // If set to "Everyone" then group is checked as well
+ bool any_av_sound = self->mCheckAVSoundAny->get();
+ bool group_av_sound = true; // If set to "Everyone" then group is checked as well
if (!any_av_sound)
{ // If "Everyone" is off, use the value from the checkbox
group_av_sound = self->mCheckAVSoundGroup->get();